diff options
| author | Stephen Berman <stephen.berman@gmx.net> | 2016-06-27 16:50:03 -0400 |
|---|---|---|
| committer | Mark Oteiza <mvoteiza@udel.edu> | 2016-06-27 16:50:09 -0400 |
| commit | 1f5592572887fe15e5b660bc60e66a7ab7c624cd (patch) | |
| tree | b5324324db3b071541009cc3d0cfe6d65e1968b0 /lisp/vc/diff-mode.el | |
| parent | 1bd74554970450054c874dbb69837b43f783c6bd (diff) | |
| download | emacs-1f5592572887fe15e5b660bc60e66a7ab7c624cd.tar.gz | |
; Fix breakage from previous commit
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 43ff9e07d28..58498cb6115 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -371,22 +371,22 @@ and the face `diff-added' for added lines.") (defvar diff-font-lock-keywords `((,(concat "\\(" diff-hunk-header-re-unified "\\)\\(.*\\)$") - (1 diff-hunk-header) (6 diff-function)) + (1 'diff-hunk-header) (6 'diff-function)) ("^\\(\\*\\{15\\}\\)\\(.*\\)$" ;context - (1 diff-hunk-header) (2 diff-function)) - ("^\\*\\*\\* .+ \\*\\*\\*\\*". diff-hunk-header) ;context - (,diff-context-mid-hunk-header-re . diff-hunk-header) ;context - ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header) ;normal - ("^---$" . diff-hunk-header) ;normal + (1 'diff-hunk-header) (2 'diff-function)) + ("^\\*\\*\\* .+ \\*\\*\\*\\*". 'diff-hunk-header) ;context + (,diff-context-mid-hunk-header-re . 'diff-hunk-header) ;context + ("^[0-9,]+[acd][0-9,]+$" . 'diff-hunk-header) ;normal + ("^---$" . 'diff-hunk-header) ;normal ;; For file headers, accept files with spaces, but be careful to rule ;; out false-positives when matching hunk headers. ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^\t\n]+?\\)\\(?:\t.*\\| \\(\\*\\*\\*\\*\\|----\\)\\)?\n" - (0 diff-header) - (2 (if (not (match-end 3)) diff-file-header) prepend)) + (0 'diff-header) + (2 (if (not (match-end 3)) 'diff-file-header) prepend)) ("^\\([-<]\\)\\(.*\n\\)" - (1 diff-indicator-removed-face) (2 diff-removed)) + (1 diff-indicator-removed-face) (2 'diff-removed)) ("^\\([+>]\\)\\(.*\n\\)" - (1 diff-indicator-added-face) (2 diff-added)) + (1 diff-indicator-added-face) (2 'diff-added)) ("^\\(!\\)\\(.*\n\\)" (1 (if diff-use-changed-face diff-indicator-changed-face @@ -399,20 +399,20 @@ and the face `diff-added' for added lines.") diff-indicator-added-face diff-indicator-removed-face))))) (2 (if diff-use-changed-face - diff-changed + 'diff-changed ;; Otherwise, use the same method as above. (save-match-data (let ((limit (save-excursion (diff-beginning-of-hunk)))) (if (save-excursion (re-search-backward diff-context-mid-hunk-header-re limit t)) - diff-added - diff-removed)))))) + 'diff-added + 'diff-removed)))))) ("^\\(?:Index\\|revno\\): \\(.+\\).*\n" - (0 diff-header) (1 diff-index prepend)) - ("^Only in .*\n" . diff-nonexistent) + (0 'diff-header) (1 'diff-index prepend)) + ("^Only in .*\n" . 'diff-nonexistent) ("^\\(#\\)\\(.*\\)" (1 font-lock-comment-delimiter-face) (2 font-lock-comment-face)) - ("^[^-=+*!<>#].*\n" (0 diff-context)))) + ("^[^-=+*!<>#].*\n" (0 'diff-context)))) (defconst diff-font-lock-defaults '(diff-font-lock-keywords t nil nil nil (font-lock-multiline . nil))) |