diff options
| -rw-r--r-- | lisp/ediff-ptch.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index a06c861e3a6..bd74071388c 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | (concat "\\(" ; context diff 2-liner | 41 | (concat "\\(" ; context diff 2-liner |
| 42 | "^\\*\\*\\* \\([^ \t]+\\)[^*]+[\t ]*\n--- \\([^ \t]+\\)" | 42 | "^\\*\\*\\* \\([^ \t]+\\)[^*]+[\t ]*\n--- \\([^ \t]+\\)" |
| 43 | "\\|" ; GNU unified format diff 2-liner | 43 | "\\|" ; GNU unified format diff 2-liner |
| 44 | "^--- \\([^ \t]+\\)[^-]+[\t ]*\n\\+\\+\\+ \\([^ \t]+\\)" | 44 | "^--- \\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^ \t]+\\)" |
| 45 | "\\)") | 45 | "\\)") |
| 46 | "*Regexp matching filename 2-liners at the start of each context diff.") | 46 | "*Regexp matching filename 2-liners at the start of each context diff.") |
| 47 | 47 | ||
| @@ -112,10 +112,10 @@ | |||
| 112 | (forward-char 1) ; ensure progress towards the end | 112 | (forward-char 1) ; ensure progress towards the end |
| 113 | (setq mark2 (move-marker (make-marker) (match-beginning 0)) | 113 | (setq mark2 (move-marker (make-marker) (match-beginning 0)) |
| 114 | mark2-end (match-end 0) | 114 | mark2-end (match-end 0) |
| 115 | beg1 (match-beginning 2) | 115 | beg1 (or (match-beginning 2) (match-beginning 4)) |
| 116 | end1 (match-end 2) | 116 | end1 (or (match-end 2) (match-end 4)) |
| 117 | beg2 (match-beginning 3) | 117 | beg2 (or (match-beginning 3) (match-beginning 5)) |
| 118 | end2 (match-end 3)) | 118 | end2 (or (match-end 3) (match-end 5))) |
| 119 | ;; possible-file-names is holding the new file names until we | 119 | ;; possible-file-names is holding the new file names until we |
| 120 | ;; insert the old file name in the patch map | 120 | ;; insert the old file name in the patch map |
| 121 | ;; It is a pair (filename from 1st header line . fn from 2nd line) | 121 | ;; It is a pair (filename from 1st header line . fn from 2nd line) |