Mercurial > vim

comparison src/memline.c @ 1978:7e0c8a18c915 v7.2.275

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.2-275
author vimboss
date Tue, 03 Nov 2009 14:33:17 +0000
parents e12f574898a9
children 5d5cad78a838
comparison
equal deleted inserted replaced
1977:f018c759e4ed 1978:7e0c8a18c915
1283 } 1283 }
1284 1284
1285 for (i = 0; i < dp->db_line_count; ++i) 1285 for (i = 0; i < dp->db_line_count; ++i)
1286 { 1286 {
1287 txt_start = (dp->db_index[i] & DB_INDEX_MASK); 1287 txt_start = (dp->db_index[i] & DB_INDEX_MASK);
1288 if (txt_start <= HEADER_SIZE 1288 if (txt_start <= (int)HEADER_SIZE
1289 || txt_start >= (int)dp->db_txt_end) 1289 || txt_start >= (int)dp->db_txt_end)
1290 { 1290 {
1291 p = (char_u *)"???"; 1291 p = (char_u *)"???";
1292 ++error; 1292 ++error;
1293 } 1293 }
1294 else 1294 else
1295 p = (char_u *)dp + txt_start; 1295 p = (char_u *)dp + txt_start;
1296 ml_append(lnum++, p, (colnr_T)0, TRUE); 1296 ml_append(lnum++, p, (colnr_T)0, TRUE);
1297 } 1297 }
1298 if (has_error) 1298 if (has_error)
1299 ml_append(lnum++, (char_u *)_("???END"), (colnr_T)0, TRUE); 1299 ml_append(lnum++, (char_u *)_("???END"),
1300 (colnr_T)0, TRUE);
1300 } 1301 }
1301 } 1302 }
1302 } 1303 }
1303 1304
1304 if (buf->b_ml.ml_stack_top == 0) /* finished */ 1305 if (buf->b_ml.ml_stack_top == 0) /* finished */
3574 3575
3575 /* 3576 /*
3576 * Make swap file name out of the file name and a directory name. 3577 * Make swap file name out of the file name and a directory name.
3577 * Returns pointer to allocated memory or NULL. 3578 * Returns pointer to allocated memory or NULL.
3578 */ 3579 */
3579 /*ARGSUSED*/
3580 char_u * 3580 char_u *
3581 makeswapname(fname, ffname, buf, dir_name) 3581 makeswapname(fname, ffname, buf, dir_name)
3582 char_u *fname; 3582 char_u *fname;
3583 char_u *ffname; 3583 char_u *ffname UNUSED;
3584 buf_T *buf; 3584 buf_T *buf;
3585 char_u *dir_name; 3585 char_u *dir_name;
3586 { 3586 {
3587 char_u *r, *s; 3587 char_u *r, *s;
3588 #ifdef HAVE_READLINK 3588 #ifdef HAVE_READLINK