aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/patch.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/editors/patch.c b/editors/patch.c
index 4ee9339a7..ea1fc0974 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -290,6 +290,17 @@ static int apply_one_hunk(void)
290 // out of buffer. 290 // out of buffer.
291 291
292 for (;;) { 292 for (;;) {
293 while (plist && *plist->data == "+-"[reverse]) {
294 if (!strcmp(check->data, plist->data+1) &&
295 !backwarn) {
296 backwarn = TT.linenum;
297 if (option_mask32 & FLAG_IGNORE) {
298 dummy_revert = 1;
299 reverse ^= 1;
300 }
301 }
302 plist = plist->next;
303 }
293 if (!plist || strcmp(check->data, plist->data+1)) { 304 if (!plist || strcmp(check->data, plist->data+1)) {
294 // Match failed. Write out first line of buffered data and 305 // Match failed. Write out first line of buffered data and
295 // recheck remaining buffered data for a new match. 306 // recheck remaining buffered data for a new match.