Mercurial > emacs

comparison lisp/diff-mode.el @ 90951:3619e7770f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 793-802) - Update from CVS - Remove RCS keywords - Merge from emacs--rel--22 * emacs--rel--22 (patch 42-50) - Update from CVS - Merge from gnus--rel--5.10 - Gnus ChangeLog tweaks * gnus--rel--5.10 (patch 229-232) - Merge from emacs--devo--0, emacs--rel--22 - ChangeLog tweak - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-223
author Miles Bader <miles@gnu.org>
date Sat, 16 Jun 2007 22:32:13 +0000
parents d7172f202ab8 44761a3f6c97
children 988f1edc9674
comparison
equal deleted inserted replaced
90950:8568c29985a3 90951:3619e7770f2e
336 (1 diff-hunk-header-face) (2 diff-function-face)) 336 (1 diff-hunk-header-face) (2 diff-function-face))
337 ("^\\*\\*\\* .+ \\*\\*\\*\\*". diff-hunk-header-face) ;context 337 ("^\\*\\*\\* .+ \\*\\*\\*\\*". diff-hunk-header-face) ;context
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 ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\(\\S-+\\)\\(.*[^*-]\\)?\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))
345 ("^\\([+>]\\)\\(.*\n\\)" 345 ("^\\([+>]\\)\\(.*\n\\)"
346 (1 diff-indicator-added-face) (2 diff-added-face)) 346 (1 diff-indicator-added-face) (2 diff-added-face))