diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-15 13:40:06 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-15 13:40:06 -0500 |
| commit | ad17db7964a1022fb0f646b35a00ffc5fb70ec30 (patch) | |
| tree | dedd16177c7286ddae59e83ee5751e0463528ced /lisp/vc/smerge-mode.el | |
| parent | 5a7d0095a49faf6c71800bfde61c42eb6edd0125 (diff) | |
| download | emacs-ad17db7964a1022fb0f646b35a00ffc5fb70ec30.tar.gz | |
* lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode.
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
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. |