diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-24 21:35:40 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-24 21:35:40 +0000 |
| commit | 1ec7bd14f9e2ed207b56d86455f08140d45eb2fc (patch) | |
| tree | 7df415e28563f3641e54f9ce3125edbdde219dfc /lisp/diff-mode.el | |
| parent | beb885fbbd1d86b9e7b2f3eed31a5ac417956cc0 (diff) | |
| download | emacs-1ec7bd14f9e2ed207b56d86455f08140d45eb2fc.tar.gz | |
(diff-font-lock-keywords): Disable yank-handler.
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 9ae6bbee7c0..180fefcdd72 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -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))) |