From: Stefan Monnier Date: Sun, 11 May 2008 21:57:27 +0000 (+0000) Subject: (diff-hunk-header-re): Refine the regexp. X-Git-Tag: emacs-pretest-23.0.90~5622 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=365bdf633bfdea972e63d42bff7e503f80716e69;p=emacs.git (diff-hunk-header-re): Refine the regexp. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4f598e932bb..88c4e96202f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-05-11 Stefan Monnier + + * diff-mode.el (diff-hunk-header-re): Refine the regexp. + 2008-05-11 Juri Linkov * wid-edit.el (widget-image-directory): Change default image data diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 3bd032331b3..0090a61d0ab 100644 --- 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)