From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 23 May 2011 17:03:03 +0000 (-0300)
Subject: * lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~197
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=782fc81943849d699d74c3039be80d4068bb3422;p=emacs.git

* 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 31444f9c234..0b6766786b1 100644
--- 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 f26ccdbedda..286cb0ab9aa 100644
--- 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.