Mercurial > vim
comparison src/diff.c @ 840:2c885fab04e3 v7.0e06
updated for version 7.0e06
author | vimboss |
---|---|
date | Sat, 22 Apr 2006 22:33:57 +0000 |
parents | 8bebcabccc2c |
children | a112fdce9ebd |
comparison
equal
deleted
inserted
replaced
839:1f3b1021f002 | 840:2c885fab04e3 |
---|---|
1328 else | 1328 else |
1329 { | 1329 { |
1330 /* Allocate a new diffblock. */ | 1330 /* Allocate a new diffblock. */ |
1331 dp = diff_alloc_new(curtab, dprev, dp); | 1331 dp = diff_alloc_new(curtab, dprev, dp); |
1332 if (dp == NULL) | 1332 if (dp == NULL) |
1333 return; | 1333 goto done; |
1334 | 1334 |
1335 dp->df_lnum[idx_orig] = lnum_orig; | 1335 dp->df_lnum[idx_orig] = lnum_orig; |
1336 dp->df_count[idx_orig] = count_orig; | 1336 dp->df_count[idx_orig] = count_orig; |
1337 dp->df_lnum[idx_new] = lnum_new; | 1337 dp->df_lnum[idx_new] = lnum_new; |
1338 dp->df_count[idx_new] = count_new; | 1338 dp->df_count[idx_new] = count_new; |
1355 dprev = dp; | 1355 dprev = dp; |
1356 dp = dp->df_next; | 1356 dp = dp->df_next; |
1357 notset = TRUE; | 1357 notset = TRUE; |
1358 } | 1358 } |
1359 | 1359 |
1360 done: | |
1360 fclose(fd); | 1361 fclose(fd); |
1361 } | 1362 } |
1362 | 1363 |
1363 /* | 1364 /* |
1364 * Copy an entry at "dp" from "idx_orig" to "idx_new". | 1365 * Copy an entry at "dp" from "idx_orig" to "idx_new". |