[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104331: * lisp/vc/smerge-mode.el (sm
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104331: * lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark. |
Date: |
Mon, 23 May 2011 14:03:03 -0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104331
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8710
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-05-23 14:03:03 -0300
message:
* lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.
modified:
lisp/ChangeLog
lisp/vc/smerge-mode.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-23 16:40:16 +0000
+++ b/lisp/ChangeLog 2011-05-23 17:03:03 +0000
@@ -1,5 +1,8 @@
2011-05-23 Stefan Monnier <address@hidden>
+ * 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 <address@hidden>
=== modified file 'lisp/vc/smerge-mode.el'
--- a/lisp/vc/smerge-mode.el 2011-05-12 07:07:06 +0000
+++ b/lisp/vc/smerge-mode.el 2011-05-23 17:03:03 +0000
@@ -991,6 +991,7 @@
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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104331: * lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.,
Stefan Monnier <=