* 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 f1a8ed48c7585825990fba6727dbb7f4baff8eb4..ea1e0c726fdc450163a22ce41a38c324b2c5f74c 100644 (file)
--- 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.