[Emacs-diffs] Changes to emacs/lisp/ediff-ptch.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   07/06/13 20:24:31

Index: lisp/ediff-ptch.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-ptch.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- lisp/ediff-ptch.el  12 Jun 2007 21:18:46 -0000      1.34
+++ lisp/ediff-ptch.el  13 Jun 2007 20:24:31 -0000      1.35
@@ -134,11 +134,13 @@
   :type '(choice (const nil) string)
   :group 'ediff-ptch)
 
+;; This context diff does not recognize spaces inside files, but removing ' '
+;; from [^ \t] breaks normal patches for some reason
 (defcustom ediff-context-diff-label-regexp
   (concat "\\("        ; context diff 2-liner
-         "^\\*\\*\\* \\([^\t]+\\)[^*]+[\t ]*\n--- \\([^\t]+\\)"
+         "^\\*\\*\\* +\\([^ \t]+\\)[^*]+[\t ]*\n--- +\\([^ \t]+\\)"
          "\\|"         ; GNU unified format diff 2-liner
-         "^--- \\([^\t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^\t]+\\)"
+         "^--- +\\([^ \t]+\\)[\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