diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
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))) |