aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Berman2016-06-27 16:50:03 -0400
committerMark Oteiza2016-06-27 16:50:09 -0400
commit1f5592572887fe15e5b660bc60e66a7ab7c624cd (patch)
treeb5324324db3b071541009cc3d0cfe6d65e1968b0
parent1bd74554970450054c874dbb69837b43f783c6bd (diff)
downloademacs-1f5592572887fe15e5b660bc60e66a7ab7c624cd.tar.gz
emacs-1f5592572887fe15e5b660bc60e66a7ab7c624cd.zip
; Fix breakage from previous commit
-rw-r--r--lisp/vc/diff-mode.el32
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.")
371 371
372(defvar diff-font-lock-keywords 372(defvar diff-font-lock-keywords
373 `((,(concat "\\(" diff-hunk-header-re-unified "\\)\\(.*\\)$") 373 `((,(concat "\\(" diff-hunk-header-re-unified "\\)\\(.*\\)$")
374 (1 diff-hunk-header) (6 diff-function)) 374 (1 'diff-hunk-header) (6 'diff-function))
375 ("^\\(\\*\\{15\\}\\)\\(.*\\)$" ;context 375 ("^\\(\\*\\{15\\}\\)\\(.*\\)$" ;context
376 (1 diff-hunk-header) (2 diff-function)) 376 (1 'diff-hunk-header) (2 'diff-function))
377 ("^\\*\\*\\* .+ \\*\\*\\*\\*". diff-hunk-header) ;context 377 ("^\\*\\*\\* .+ \\*\\*\\*\\*". 'diff-hunk-header) ;context
378 (,diff-context-mid-hunk-header-re . diff-hunk-header) ;context 378 (,diff-context-mid-hunk-header-re . 'diff-hunk-header) ;context
379 ("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header) ;normal 379 ("^[0-9,]+[acd][0-9,]+$" . 'diff-hunk-header) ;normal
380 ("^---$" . diff-hunk-header) ;normal 380 ("^---$" . 'diff-hunk-header) ;normal
381 ;; For file headers, accept files with spaces, but be careful to rule 381 ;; For file headers, accept files with spaces, but be careful to rule
382 ;; out false-positives when matching hunk headers. 382 ;; out false-positives when matching hunk headers.
383 ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^\t\n]+?\\)\\(?:\t.*\\| \\(\\*\\*\\*\\*\\|----\\)\\)?\n" 383 ("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^\t\n]+?\\)\\(?:\t.*\\| \\(\\*\\*\\*\\*\\|----\\)\\)?\n"
384 (0 diff-header) 384 (0 'diff-header)
385 (2 (if (not (match-end 3)) diff-file-header) prepend)) 385 (2 (if (not (match-end 3)) 'diff-file-header) prepend))
386 ("^\\([-<]\\)\\(.*\n\\)" 386 ("^\\([-<]\\)\\(.*\n\\)"
387 (1 diff-indicator-removed-face) (2 diff-removed)) 387 (1 diff-indicator-removed-face) (2 'diff-removed))
388 ("^\\([+>]\\)\\(.*\n\\)" 388 ("^\\([+>]\\)\\(.*\n\\)"
389 (1 diff-indicator-added-face) (2 diff-added)) 389 (1 diff-indicator-added-face) (2 'diff-added))
390 ("^\\(!\\)\\(.*\n\\)" 390 ("^\\(!\\)\\(.*\n\\)"
391 (1 (if diff-use-changed-face 391 (1 (if diff-use-changed-face
392 diff-indicator-changed-face 392 diff-indicator-changed-face
@@ -399,20 +399,20 @@ and the face `diff-added' for added lines.")
399 diff-indicator-added-face 399 diff-indicator-added-face
400 diff-indicator-removed-face))))) 400 diff-indicator-removed-face)))))
401 (2 (if diff-use-changed-face 401 (2 (if diff-use-changed-face
402 diff-changed 402 'diff-changed
403 ;; Otherwise, use the same method as above. 403 ;; Otherwise, use the same method as above.
404 (save-match-data 404 (save-match-data
405 (let ((limit (save-excursion (diff-beginning-of-hunk)))) 405 (let ((limit (save-excursion (diff-beginning-of-hunk))))
406 (if (save-excursion (re-search-backward diff-context-mid-hunk-header-re limit t)) 406 (if (save-excursion (re-search-backward diff-context-mid-hunk-header-re limit t))
407 diff-added 407 'diff-added
408 diff-removed)))))) 408 'diff-removed))))))
409 ("^\\(?:Index\\|revno\\): \\(.+\\).*\n" 409 ("^\\(?:Index\\|revno\\): \\(.+\\).*\n"
410 (0 diff-header) (1 diff-index prepend)) 410 (0 'diff-header) (1 'diff-index prepend))
411 ("^Only in .*\n" . diff-nonexistent) 411 ("^Only in .*\n" . 'diff-nonexistent)
412 ("^\\(#\\)\\(.*\\)" 412 ("^\\(#\\)\\(.*\\)"
413 (1 font-lock-comment-delimiter-face) 413 (1 font-lock-comment-delimiter-face)
414 (2 font-lock-comment-face)) 414 (2 font-lock-comment-face))
415 ("^[^-=+*!<>#].*\n" (0 diff-context)))) 415 ("^[^-=+*!<>#].*\n" (0 'diff-context))))
416 416
417(defconst diff-font-lock-defaults 417(defconst diff-font-lock-defaults
418 '(diff-font-lock-keywords t nil nil nil (font-lock-multiline . nil))) 418 '(diff-font-lock-keywords t nil nil nil (font-lock-multiline . nil)))