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

* lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias.

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

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

@ -919,7 +919,7 @@ Its behavior has mainly two restrictions:
after the newline.
This only matters if `smerge-refine-ignore-whitespace' is nil.
- it needs to be unaffected by changes performed by the `preproc' argument
to `smerge-refine-subst'.
to `smerge-refine-regions'.
This only matters if `smerge-refine-weight-hack' is nil.")
(defvar smerge-refine-ignore-whitespace t
@ -1188,7 +1188,7 @@ repeating the command will highlight other two parts."
(put-text-property (match-beginning 0) (1+ (match-beginning 0))
'smerge-refine-part
(cons (buffer-chars-modified-tick) part)))
(smerge-refine-subst (match-beginning n1) (match-end n1)
(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)))