From: Glenn Morris <rgm@gnu.org>
Date: Fri, 15 Dec 2017 18:40:06 +0000 (-0500)
Subject: * lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode.
X-Git-Tag: emacs-26.0.91~130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ad17db7;p=emacs.git

* lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode.
---

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index f1a8ed48c75..ea1e0c726fd 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.