Mercurial > emacs
changeset 106571:a452e58c22cb
(ediff-context-diff-label-regexp): Don't match
whitespace after the file name of the first line of unified format,
because git-diff doesn't output whitespace and file modification time
after the file name.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Mon, 14 Dec 2009 06:52:59 +0000 |
| parents | d673a0a0ee2f |
| children | 80607ca6d8f0 |
| files | lisp/ChangeLog lisp/ediff-ptch.el |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Dec 14 06:39:39 2009 +0000 +++ b/lisp/ChangeLog Mon Dec 14 06:52:59 2009 +0000 @@ -1,3 +1,10 @@ +2009-12-14 Juri Linkov <juri@jurta.org> + + * ediff-ptch.el (ediff-context-diff-label-regexp): Don't match + whitespace after the file name of the first line of unified format, + because git-diff doesn't output whitespace and file modification time + after the file name. + 2009-12-14 David Kastrup <dak@gnu.org> * info.el (Info-hide-cookies-node): Before hiding a cookie,
--- a/lisp/ediff-ptch.el Mon Dec 14 06:39:39 2009 +0000 +++ b/lisp/ediff-ptch.el Mon Dec 14 06:52:59 2009 +0000 @@ -126,8 +126,8 @@ (defcustom ediff-context-diff-label-regexp (concat "\\(" ; context diff 2-liner "^\\*\\*\\* +\\([^ \t]+\\)[^*]+[\t ]*\n--- +\\([^ \t]+\\)" - "\\|" ; GNU unified format diff 2-liner - "^--- +\\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ +\\([^ \t]+\\)" + "\\|" ; unified format diff 2-liner + "^--- +\\([^ \t]+\\).*\n\\+\\+\\+ +\\([^ \t]+\\)" "\\)") "Regexp matching filename 2-liners at the start of each context diff. You probably don't want to change that, unless you are using an obscure patch