* lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.

Fixes: debbugs:8710

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31444f9c234f10223d80973e8a823139a09ec431..0b6766786b113b4972eece3719d091b52e1da037 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark
+       (bug#8710).
+
        * emacs-lisp/lisp.el (up-list): Fix forward movement (bug#8708).
 
 2011-05-23  Ken Manheimer  <ken.manheimer@gmail.com>

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index f26ccdbedda3c7dc7e11b5899ecc4b283c0b06b8..286cb0ab9aa516b59ca44c0a636d632144647cdd 100644 (file)
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -991,6 +991,7 @@ a copy of a region, just before preparing it to for `diff'.  It can be
 used to replace chars to try and eliminate some spurious differences."
   (let* ((buf (current-buffer))
          (pos (point))
+         deactivate-mark         ; The code does not modify any visible buffer.
          (file1 (make-temp-file "diff1"))
          (file2 (make-temp-file "diff2")))
     ;; Chop up regions into smaller elements and save into files.