diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
| commit | 2fcb85c3e780f1f2871ce0f300cfaffce9836eb0 (patch) | |
| tree | a8857ccad8bff12080062a3edaad1a55a3eb8171 /lisp/vc/smerge-mode.el | |
| parent | 1f626e9662d8120acd5a937f847123cc2b8c6e31 (diff) | |
| parent | 6bfdfeed36fab4680c8db90c22da8f6611694186 (diff) | |
| download | emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.gz emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.bz2 emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 3b09dfe5d2e..c66a4fb2d6a 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -173,8 +173,7 @@ Used in `smerge-diff-base-upper' and related functions." `((,smerge-command-prefix . ,smerge-basic-map)) "Keymap for `smerge-mode'.") -(defvar smerge-check-cache nil) -(make-variable-buffer-local 'smerge-check-cache) +(defvar-local smerge-check-cache nil) (defun smerge-check (n) (condition-case nil (let ((state (cons (point) (buffer-modified-tick)))) @@ -1411,7 +1410,7 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict." \\{smerge-mode-map}" :group 'smerge :lighter " SMerge" - (when (and (boundp 'font-lock-mode) font-lock-mode) + (when font-lock-mode (save-excursion (if smerge-mode (font-lock-add-keywords nil smerge-font-lock-keywords 'append) |