From: Laurent Ganier Date: Sun, 2 Nov 2003 11:42:47 +0000 (+0000) Subject: [ 834490 ] Ignore blank lines disabled when ignore EOL X-Git-Tag: 2.16.5~7571 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ce7eef0290ee320ca076f46d53c8f1637e846cf;p=winmerge-jp%2Fwinmerge-jp.git [ 834490 ] Ignore blank lines disabled when ignore EOL --- diff --git a/Src/diffutils/src/UTIL.C b/Src/diffutils/src/UTIL.C index 808bcdf16..11ec23eb3 100644 --- a/Src/diffutils/src/UTIL.C +++ b/Src/diffutils/src/UTIL.C @@ -769,7 +769,7 @@ analyze_hunk (hunk, first0, last0, first1, last1, deletes, inserts) show_to += next->inserted; for (i = next->line0; i <= l0 && trivial; i++) - if (!ignore_blank_lines_flag || !iseolch(files[0].linbuf[i][0])) + if (!ignore_blank_lines_flag || (!iseolch(files[0].linbuf[i][0]) && files[0].linbuf[i][0] != 0)) { struct regexp_list *r; char const HUGE *line = files[0].linbuf[i]; @@ -785,7 +785,7 @@ analyze_hunk (hunk, first0, last0, first1, last1, deletes, inserts) } for (i = next->line1; i <= l1 && trivial; i++) - if (!ignore_blank_lines_flag || !iseolch(files[1].linbuf[i][0])) + if (!ignore_blank_lines_flag || (!iseolch(files[1].linbuf[i][0]) && files[1].linbuf[i][0] != 0)) { struct regexp_list *r; char const HUGE *line = files[1].linbuf[i]; diff --git a/Src/readme.txt b/Src/readme.txt index 69b16eda9..e45b2a02b 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,7 @@ +2003-11-02 Laoran + BUG: [ 834490 ] Ignore blank lines disabled when ignore EOL + WinMerge: UTIL.C + 2003-11-01 Kimmo BUG: [ 833096 ] Left/right-only status overwrites skipped-status WinMerge: DirViewColItems.cpp