Mercurial > emacs
changeset 94872:c5a53051fe83
(diff-hunk-header-re): Refine the regexp.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 11 May 2008 21:57:27 +0000 |
| parents | 41d345675cae |
| children | 66788c63a40a |
| files | lisp/ChangeLog lisp/diff-mode.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun May 11 20:32:33 2008 +0000 +++ b/lisp/ChangeLog Sun May 11 21:57:27 2008 +0000 @@ -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
--- a/lisp/diff-mode.el Sun May 11 20:32:33 2008 +0000 +++ b/lisp/diff-mode.el Sun May 11 21:57:27 2008 +0000 @@ -420,7 +420,7 @@ (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)