diff options
| author | Stefan Monnier | 2007-06-13 21:11:42 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-06-13 21:11:42 +0000 |
| commit | 97311ec3a4d914e61a142e5eb790f830ec71018c (patch) | |
| tree | ff680592b4c9917f93cae7e6c8a92962756fecb5 | |
| parent | 86e7351682dcdbe4c76dd66d61b75568782895d3 (diff) | |
| download | emacs-97311ec3a4d914e61a142e5eb790f830ec71018c.tar.gz emacs-97311ec3a4d914e61a142e5eb790f830ec71018c.zip | |
(diff-font-lock-keywords): Fix M. Kifer's last change.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/diff-mode.el | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 34197ec6c45..602ff2d7838 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,11 @@ | |||
| 1 | 2007-06-13 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * diff-mode.el (diff-font-lock-keywords): Fix M. Kifer's last change. | ||
| 4 | |||
| 1 | 2007-06-13 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> (tiny change) | 5 | 2007-06-13 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> (tiny change) |
| 2 | 6 | ||
| 3 | * term/xterm.el (terminal-init-xterm): Escape parens in character | 7 | * term/xterm.el (terminal-init-xterm): Escape parens in character |
| 4 | constants. | 8 | constants. |
| 5 | 9 | ||
| 6 | 2007-06-13 Stefan Monnier <monnier@iro.umontreal.ca> | 10 | 2007-06-13 Stefan Monnier <monnier@iro.umontreal.ca> |
| 7 | 11 | ||
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 7346de8567a..973e387f230 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -338,7 +338,7 @@ when editing big diffs)." | |||
| 338 | ("^--- .+ ----$" . diff-hunk-header-face) ;context | 338 | ("^--- .+ ----$" . diff-hunk-header-face) ;context |
| 339 | ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face) ;normal | 339 | ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face) ;normal |
| 340 | ("^---$" . diff-hunk-header-face) ;normal | 340 | ("^---$" . diff-hunk-header-face) ;normal |
| 341 | ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^\t]+\\)\\(.*[^*-]\\)?\n" | 341 | ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^ \t]+\\)\\(.*[^*-]\\)?\n" |
| 342 | (0 diff-header-face) (2 diff-file-header-face prepend)) | 342 | (0 diff-header-face) (2 diff-file-header-face prepend)) |
| 343 | ("^\\([-<]\\)\\(.*\n\\)" | 343 | ("^\\([-<]\\)\\(.*\n\\)" |
| 344 | (1 diff-indicator-removed-face) (2 diff-removed-face)) | 344 | (1 diff-indicator-removed-face) (2 diff-removed-face)) |