[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 ad17db7: * lisp/vc/smerge-mode.el (smerge-refine)
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-26 ad17db7: * lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode. |
Date: |
Fri, 15 Dec 2017 13:40:12 -0500 (EST) |
branch: emacs-26
commit ad17db7964a1022fb0f646b35a00ffc5fb70ec30
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode.
---
lisp/vc/smerge-mode.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index f1a8ed4..ea1e0c7 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1191,12 +1191,12 @@ repeating the command will highlight other two parts."
(smerge-refine-regions (match-beginning n1) (match-end n1)
(match-beginning n2) (match-end n2)
(if smerge-use-changed-face
- '((smerge . refine) (face .
smerge-refined-change)))
+ '((smerge . refine) (font-lock-face .
smerge-refined-change)))
nil
(unless smerge-use-changed-face
- '((smerge . refine) (face . smerge-refined-removed)))
+ '((smerge . refine) (font-lock-face .
smerge-refined-removed)))
(unless smerge-use-changed-face
- '((smerge . refine) (face .
smerge-refined-added))))))
+ '((smerge . refine) (font-lock-face .
smerge-refined-added))))))
(defun smerge-swap ()
"Swap the \"Upper\" and the \"Lower\" chunks.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 ad17db7: * lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode.,
Glenn Morris <=