(diff-hunk-header-re): Refine the regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f598e932bb99ceb1f21649a04bc7127af57fc5e..88c4e96202f23a83a30c93d504ba237b2e7da656 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * diff-mode.el (diff-hunk-header-re): Refine the regexp.
+
 2008-05-11  Juri Linkov  <juri@jurta.org>
 
        * wid-edit.el (widget-image-directory): Change default image data

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 3bd032331b3840e46d2d4a06f2b6f7af7ccd38a1..0090a61d0ab0e39603d5ab3bb458ec42e75d93e3 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -420,7 +420,7 @@ See http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html")
 
 (defconst diff-hunk-header-re
   (concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$"))
-(defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1)))
+(defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* \n]\\).+\n" (substring diff-hunk-header-re 1)))
 (defvar diff-narrowed-to nil)
 
 (defun diff-hunk-style (&optional style)