diff options
| author | Stefan Monnier | 2008-05-11 21:57:27 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-05-11 21:57:27 +0000 |
| commit | 365bdf633bfdea972e63d42bff7e503f80716e69 (patch) | |
| tree | facaaef52ef5ddb511ab4d2f8e8a4fe40dd35d16 | |
| parent | fd3d78f2922a086fc053618b8133cc909f6035e6 (diff) | |
| download | emacs-365bdf633bfdea972e63d42bff7e503f80716e69.tar.gz emacs-365bdf633bfdea972e63d42bff7e503f80716e69.zip | |
(diff-hunk-header-re): Refine the regexp.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/diff-mode.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4f598e932bb..88c4e96202f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-05-11 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * diff-mode.el (diff-hunk-header-re): Refine the regexp. | ||
| 4 | |||
| 1 | 2008-05-11 Juri Linkov <juri@jurta.org> | 5 | 2008-05-11 Juri Linkov <juri@jurta.org> |
| 2 | 6 | ||
| 3 | * wid-edit.el (widget-image-directory): Change default image data | 7 | * 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") | |||
| 420 | 420 | ||
| 421 | (defconst diff-hunk-header-re | 421 | (defconst diff-hunk-header-re |
| 422 | (concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")) | 422 | (concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")) |
| 423 | (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1))) | 423 | (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* \n]\\).+\n" (substring diff-hunk-header-re 1))) |
| 424 | (defvar diff-narrowed-to nil) | 424 | (defvar diff-narrowed-to nil) |
| 425 | 425 | ||
| 426 | (defun diff-hunk-style (&optional style) | 426 | (defun diff-hunk-style (&optional style) |