]> git.neil.brown.name Git - wiggle.git/commitdiff
Browser: disable ignore-blanks after editing.
authorNeilBrown <neilb@suse.de>
Fri, 23 Aug 2013 01:20:54 +0000 (11:20 +1000)
committerNeilBrown <neilb@suse.de>
Fri, 23 Aug 2013 01:20:54 +0000 (11:20 +1000)
If we leave it enabled, then the result written out can
be different to the final edit and print_merge prefers the
A stream to the C stream.

Disabling it shouldn't hurt as now more cleverness is expected,
just viewing of the result.

Signed-off-by: NeilBrown <neilb@suse.de>
vpatch.c

index 063062bba0de0b9f86823d842f44f91c3a53039f..98ff728a8c91abad08c0f484515791a5d49e586b 100644 (file)
--- a/vpatch.c
+++ b/vpatch.c
@@ -1867,6 +1867,7 @@ static int merge_window(struct plist *p, FILE *f, int reverse, int replace,
                                sb.body = memdup(sm.body, sm.len);
                        }
                        free(sp.body);
+                       ignore_blanks = 0;
                        prepare_merge(0);
                        refresh = 2;
                        changes = 1;