Mercurial > emacs
diff lisp/ediff-ptch.el @ 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 | c5bcf5ad255f |
| children | b98604865ea0 3619e7770f2e |
line wrap: on
line diff
--- 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