Commit ff6f4585 authored by Juri Linkov's avatar Juri Linkov
Browse files

(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.
parent 2251f362
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,
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment