martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(ediff-context-diff-label-regexp): Don't match

Browse Source 
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.
This commit is contained in:
Juri Linkov
2009-12-14 06:52:59 +00:00
parent 2251f36277
commit ff6f4585ee
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@@ -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,

4
lisp/ediff-ptch.el
View File

@@ -126,8 +126,8 @@ patch. So, don't change these variables, unless the default doesn't work."
(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