2007-06-13 Michael Kifer <kifer@cs.stonybrook.edu>

	* ediff-ptch.el (ediff-context-diff-label-regexp): partially undid
	previous patch

diff --git a/ChangeLog b/ChangeLog
index 695292c9856e0ac5f8f068467055723c3e31dfb2..fee0379ac7d602108fb06eee357886e55f7f2597 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-13  Michael Kifer  <kifer@cs.stonybrook.edu>
+       
+       * ediff-ptch.el (ediff-context-diff-label-regexp): partially undid
+       previous patch
+
 2007-06-13  Chong Yidong  <cyd@stupidchicken.com>
 
        * configure.in: Merge xaw3d and libXaw checks.  Check xaw3d even

diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 45fb1e2a3f6511659601685e33e1fa1680a87244..8c0be8b1c8dc14850c16ee009382632c99cf385a 100644 (file)
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -134,11 +134,13 @@ patch.  So, don't change these variables, unless the default doesn't work."
   :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

diff --git a/lisp/ediff.el b/lisp/ediff.el
index c5f5c48f8da685512ed27da6e69c4bc79f178049..69717ca13ad8e5ca26b727f650a97f7619a0d3fe 100644 (file)
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -7,8 +7,8 @@
 ;; Created: February 2, 1994
 ;; Keywords: comparing, merging, patching, tools, unix
 
-(defconst ediff-version "2.81.1" "The current version of Ediff")
-(defconst ediff-date "October 23, 2006" "Date of last update")
+(defconst ediff-version "2.81.2" "The current version of Ediff")
+(defconst ediff-date "June 13, 2007" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.