[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 5a7d009: * lisp/vc/smerge-mode.el (smerge-refine)
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-26 5a7d009: * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias. |
Date: |
Fri, 15 Dec 2017 13:35:46 -0500 (EST) |
branch: emacs-26
commit 5a7d0095a49faf6c71800bfde61c42eb6edd0125
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias.
---
lisp/vc/smerge-mode.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index b988463..f1a8ed4 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 5a7d009: * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias.,
Glenn Morris <=