mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

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

Browse Source 
Fixes: debbugs:8710
This commit is contained in:
Stefan Monnier 2011-05-23 14:03:03 -03:00
parent e44e373d30
commit 782fc81943
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -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>

1
lisp/vc/smerge-mode.el
View File

@ -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.