diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-06-13 20:24:31 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-06-13 20:24:31 +0000 |
| commit | 141f0c038a2cbf9cc91fed54ca6aac76120d216d (patch) | |
| tree | af5f64e78af5e6adabf735b375ee9dbe10bf8d4f | |
| parent | ecda6582536032e0c8af2a01235f77a2bcda5e07 (diff) | |
| download | emacs-141f0c038a2cbf9cc91fed54ca6aac76120d216d.tar.gz | |
2007-06-13 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-ptch.el (ediff-context-diff-label-regexp): partially undid
previous patch
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ediff-ptch.el | 6 | ||||
| -rw-r--r-- | lisp/ediff.el | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 695292c9856..fee0379ac7d 100644 --- 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 45fb1e2a3f6..8c0be8b1c8d 100644 --- 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 c5f5c48f8da..69717ca13ad 100644 --- 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. |