diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
| commit | 1011c48763982d02797a7058556d29f639f6efca (patch) | |
| tree | 5f1b7529b4cc483b73475b89245633c5848b8a5e /lisp/diff-mode.el | |
| parent | 6f06dac7b57b8d73f4b26a855cd9862630192029 (diff) | |
| parent | 69e4c7c4bacf19e9e004605fcb1c067e478beffe (diff) | |
| download | emacs-1011c48763982d02797a7058556d29f639f6efca.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-805)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 973e387f230..64199147c21 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -338,7 +338,7 @@ when editing big diffs)." ("^--- .+ ----$" . diff-hunk-header-face) ;context ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face) ;normal ("^---$" . diff-hunk-header-face) ;normal - ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^ \t]+\\)\\(.*[^*-]\\)?\n" + ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^\t\n]+\\)\\(.*[^*-]\\)?\n" (0 diff-header-face) (2 diff-file-header-face prepend)) ("^\\([-<]\\)\\(.*\n\\)" (1 diff-indicator-removed-face) (2 diff-removed-face)) |