Mercurial > emacs

comparison lisp/ediff-ptch.el @ 81382:dbd9a7dfa004

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
81381:bf9ea781e3e0 81382:dbd9a7dfa004
132 (defcustom ediff-patch-default-directory nil 132 (defcustom ediff-patch-default-directory nil
133 "*Default directory to look for patches." 133 "*Default directory to look for patches."
134 :type '(choice (const nil) string) 134 :type '(choice (const nil) string)
135 :group 'ediff-ptch) 135 :group 'ediff-ptch)
136 136
137 ;; This context diff does not recognize spaces inside files, but removing ' '
138 ;; from [^ \t] breaks normal patches for some reason
137 (defcustom ediff-context-diff-label-regexp 139 (defcustom ediff-context-diff-label-regexp
138 (concat "\\(" ; context diff 2-liner 140 (concat "\\(" ; context diff 2-liner
139 "^\\*\\*\\* \\([^\t]+\\)[^*]+[\t ]*\n--- \\([^\t]+\\)" 141 "^\\*\\*\\* +\\([^ \t]+\\)[^*]+[\t ]*\n--- +\\([^ \t]+\\)"
140 "\\|" ; GNU unified format diff 2-liner 142 "\\|" ; GNU unified format diff 2-liner
141 "^--- \\([^\t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^\t]+\\)" 143 "^--- +\\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ +\\([^ \t]+\\)"
142 "\\)") 144 "\\)")
143 "*Regexp matching filename 2-liners at the start of each context diff. 145 "*Regexp matching filename 2-liners at the start of each context diff.
144 You probably don't want to change that, unless you are using an obscure patch 146 You probably don't want to change that, unless you are using an obscure patch
145 program." 147 program."
146 :type 'regexp 148 :type 'regexp