[Emacs-diffs] emacs/lisp ChangeLog ediff-ptch.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/12/14 06:53:04

Modified files:
        lisp           : ChangeLog ediff-ptch.el 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16901&r2=1.16902
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-ptch.el?cvsroot=emacs&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16901
retrieving revision 1.16902
diff -u -b -r1.16901 -r1.16902
--- ChangeLog   14 Dec 2009 05:09:08 -0000      1.16901
+++ ChangeLog   14 Dec 2009 06:52:59 -0000      1.16902
@@ -1,3 +1,10 @@
+2009-12-14  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * info.el (Info-hide-cookies-node): Before hiding a cookie,

Index: ediff-ptch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-ptch.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- ediff-ptch.el       31 Jan 2009 22:10:29 -0000      1.47
+++ ediff-ptch.el       14 Dec 2009 06:53:04 -0000      1.48
@@ -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