OSDN Git Service

Fix osdn.net ticket #41668: When the 'Ignore change/all' and the 'Ignore blank lines...
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Mon, 1 Mar 2021 14:02:05 +0000 (23:02 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Mon, 1 Mar 2021 14:02:05 +0000 (23:02 +0900)
Src/diffutils/src/util.c

index 714c998..b782cd8 100644 (file)
@@ -798,7 +798,7 @@ analyze_hunk (struct change *hunk,
             }
           else if (ignore_all_space_flag | ignore_space_change_flag)
             {
-              if (!is_blank_line(fd[0].linbuf[i], fd[1].linbuf[i + 1]))
+              if (!is_blank_line(fd[0].linbuf[i], fd[0].linbuf[i + 1]))
                 trivial = 0;
             }
           else if (!iseolch(fd[0].linbuf[i][0]) && fd[0].linbuf[i][0] != 0)