From: Glenn Morris <rgm@gnu.org>
Date: Fri, 15 Dec 2017 18:35:25 +0000 (-0500)
Subject: * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias.
X-Git-Tag: emacs-26.0.91~131
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a7d0095a49faf6c71800bfde61c42eb6edd0125;p=emacs.git

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

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index b988463de1e..f1a8ed48c75 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)))