(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2015c5356cff67ca4e79d1eaa682c444a1dbe112..df0a394aa66e87abbf723a038711b469a5a9182c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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,

diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 9ae663df68d97ab35835196ae30f8981c4b1b7c2..9d4d3350a321d7f8dd534ce789074d4a91fda461 100644 (file)
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -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