Mercurial > emacs
changeset 16168:587b9c438823
(ediff-context-diff-label-regexp): Recognize -u format better.
(ediff-map-patch-buffer): Recognize -u format better.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 11 Sep 1996 23:29:09 +0000 |
| parents | 651ee074f8b0 |
| children | fb8897dbca30 |
| files | lisp/ediff-ptch.el |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-ptch.el Wed Sep 11 21:59:57 1996 +0000 +++ b/lisp/ediff-ptch.el Wed Sep 11 23:29:09 1996 +0000 @@ -41,7 +41,7 @@ (concat "\\(" ; context diff 2-liner "^\\*\\*\\* \\([^ \t]+\\)[^*]+[\t ]*\n--- \\([^ \t]+\\)" "\\|" ; GNU unified format diff 2-liner - "^--- \\([^ \t]+\\)[^-]+[\t ]*\n\\+\\+\\+ \\([^ \t]+\\)" + "^--- \\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^ \t]+\\)" "\\)") "*Regexp matching filename 2-liners at the start of each context diff.") @@ -112,10 +112,10 @@ (forward-char 1) ; ensure progress towards the end (setq mark2 (move-marker (make-marker) (match-beginning 0)) mark2-end (match-end 0) - beg1 (match-beginning 2) - end1 (match-end 2) - beg2 (match-beginning 3) - end2 (match-end 3)) + beg1 (or (match-beginning 2) (match-beginning 4)) + end1 (or (match-end 2) (match-end 4)) + beg2 (or (match-beginning 3) (match-beginning 5)) + end2 (or (match-end 3) (match-end 5))) ;; possible-file-names is holding the new file names until we ;; insert the old file name in the patch map ;; It is a pair (filename from 1st header line . fn from 2nd line)