Mercurial > vim

comparison src/diff.c @ 358:e111db373ca4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0093
author vimboss
date Sat, 25 Jun 2005 22:49:46 +0000
parents eee3fa1b0197
children 3709cf52b9b5
comparison
equal deleted inserted replaced
357:25dd5036f2b0 358:e111db373ca4
67 static void diff_check_unchanged __ARGS((diff_T *dp)); 67 static void diff_check_unchanged __ARGS((diff_T *dp));
68 static int diff_check_sanity __ARGS((diff_T *dp)); 68 static int diff_check_sanity __ARGS((diff_T *dp));
69 static void diff_redraw __ARGS((int dofold)); 69 static void diff_redraw __ARGS((int dofold));
70 static int diff_write __ARGS((buf_T *buf, char_u *fname)); 70 static int diff_write __ARGS((buf_T *buf, char_u *fname));
71 static void diff_file __ARGS((char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff)); 71 static void diff_file __ARGS((char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff));
72 static void diff_clear __ARGS((void));
73 static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2)); 72 static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2));
74 static int diff_cmp __ARGS((char_u *s1, char_u *s2)); 73 static int diff_cmp __ARGS((char_u *s1, char_u *s2));
75 #ifdef FEAT_FOLDING 74 #ifdef FEAT_FOLDING
76 static void diff_fold_update __ARGS((diff_T *dp, int skip_idx)); 75 static void diff_fold_update __ARGS((diff_T *dp, int skip_idx));
77 #endif 76 #endif
1334 } 1333 }
1335 1334
1336 /* 1335 /*
1337 * Clear the list of diffblocks. 1336 * Clear the list of diffblocks.
1338 */ 1337 */
1339 static void 1338 void
1340 diff_clear() 1339 diff_clear()
1341 { 1340 {
1342 diff_T *p, *next_p; 1341 diff_T *p, *next_p;
1343 1342
1344 for (p = first_diff; p != NULL; p = next_p) 1343 for (p = first_diff; p != NULL; p = next_p)