Mercurial > emacs
changeset 81382:dbd9a7dfa004
2007-06-13 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-ptch.el (ediff-context-diff-label-regexp): partially undid
previous patch
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Wed, 13 Jun 2007 20:24:31 +0000 |
| parents | bf9ea781e3e0 |
| children | 47206e899ad1 |
| files | ChangeLog lisp/ediff-ptch.el lisp/ediff.el |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 13 18:48:09 2007 +0000 +++ b/ChangeLog Wed Jun 13 20:24:31 2007 +0000 @@ -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
--- a/lisp/ediff-ptch.el Wed Jun 13 18:48:09 2007 +0000 +++ b/lisp/ediff-ptch.el Wed Jun 13 20:24:31 2007 +0000 @@ -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
--- a/lisp/ediff.el Wed Jun 13 18:48:09 2007 +0000 +++ b/lisp/ediff.el Wed Jun 13 20:24:31 2007 +0000 @@ -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.