procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2017-12-15 13:40:06 -05:00
parent 5a7d0095a4
commit ad17db7964
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/vc/smerge-mode.el
View file

@ -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.