Commits

kifer-guest  committed d62da95

2009-12-19 Michael Kifer <kifer@cs.stonybrook.edu>

* ediff-patch.el (ediff-context-diff-label-regexp): regexp fix from the
emacs tree.

  • Participants
  • Parent commits 7828d62

Comments (0)

Files changed (2)

+2009-12-19  Michael Kifer <kifer@cs.stonybrook.edu>
+	
+	* ediff-patch.el (ediff-context-diff-label-regexp): regexp fix from the
+	emacs tree.
+	
 2009-12-07  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.80 released.

File ediff-ptch.el

 (defcustom ediff-context-diff-label-regexp
   (concat "\\(" 	; context diff 2-liner
 	  "^\\*\\*\\* +\\([^ \t]+\\)[^*]+[\t ]*\n--- +\\([^ \t]+\\)"
-	  "\\|" 	; GNU unified format diff 2-liner
-	  "^--- +\\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ +\\([^ \t]+\\)"
+	  "\\|" 	; unified format diff 2-liner
+	  "^--- +\\([^ \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