mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

(diff-font-lock-keywords): Disable yank-handler.

Browse source
This commit is contained in:
Stefan Monnier 2004-03-24 21:35:40 +00:00
parent beb885fbbd
commit 1ec7bd14f9
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/diff-mode.el
View file

@ -245,6 +245,9 @@ when editing big diffs)."
(defconst diff-yank-handler '(diff-yank-function))
(defun diff-yank-function (text)
;; FIXME: the yank-handler is now called separately on each piece of text
;; with a yank-handler property, so the next-single-property-change call
;; below will always return nil :-( --stef
(let ((mixed (next-single-property-change 0 'yank-handler text))
(start (point)))
;; First insert the text.
@ -275,14 +278,13 @@ when editing big diffs)."
("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\(\\S-+\\)\\(.*[^*-]\\)?\n"
(0 diff-header-face) (2 diff-file-header-face prepend))
("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face)
("^!.*\n" (0 '(face diff-changed-face yank-handler ,diff-yank-handler)))
("^[+>].*\n" (0 '(face diff-added-face yank-handler ,diff-yank-handler)))
("^[-<].*\n" (0 '(face diff-removed-face yank-handler ,diff-yank-handler)))
("^!.*\n" (0 diff-changed-face))
("^[+>].*\n" (0 diff-added-face))
("^[-<].*\n" (0 diff-removed-face))
("^Index: \\(.+\\).*\n" (0 diff-header-face) (1 diff-index-face prepend))
("^Only in .*\n" . diff-nonexistent-face)
("^#.*" . font-lock-string-face)
("^[^-=+*!<>].*\n"
(0 '(face diff-context-face yank-handler ,diff-yank-handler)))))
("^[^-=+*!<>].*\n" (0 diff-context-face))))
(defconst diff-font-lock-defaults
'(diff-font-lock-keywords t nil nil nil (font-lock-multiline . nil)))