mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

lisp/vc/smerge-mode.el (smerge--refine-apply-diff): Typo

Browse source
This commit is contained in:
Stefan Monnier 2026-03-11 12:15:49 -04:00
parent 40f4fc1d8c
commit 771ab21367
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1242,7 +1242,7 @@ need to be markers to indicate the corresponding buffers)."
(with-current-buffer (overlay-buffer ol1)
(goto-char pt1)
;; Usually ol1 and ol2 are in the same buffer, so do the `set-buffer'
;; from ol1 to maximize the change that it's a no-op.
;; from ol1 to maximize the chance that it's a no-op.
(with-current-buffer (overlay-buffer ol2) (goto-char pt2))))))
(defun smerge--refine-apply-diff-1 ( diffbuf ol1 ol2