diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc/smerge-mode.el | 1 |
2 files changed, 4 insertions, 0 deletions
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. |