# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1260773579 0
# Node ID a452e58c22cbb943cb8147e3fd446a31569f68d2
# Parent  d673a0a0ee2fa165e7a0f862c219c7f8577d0ec0
(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 -r d673a0a0ee2f -r a452e58c22cb lisp/ChangeLog
--- 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,
diff -r d673a0a0ee2f -r a452e58c22cb lisp/ediff-ptch.el
--- 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