(set-mark-command): Deactivate mark on second C-SPC C-SPC

when using transient-mark-mode.

diff --git a/etc/NEWS b/etc/NEWS
index da00a9cc2bccc6c848fe77e6f42dfa322db56269..b8cc452404ca5f2c92cc69bf214eedf39c9e9f96 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -136,6 +136,8 @@ the currently selected Emacs frame.
 
 ** Emacs now supports the SVG image format through librsvg2.
 
+** C-SPC C-SPC in transient-mark-mode pushes a mark without activating it.
+
 ** transient-mark-mode is now enabled by default.
 
 ** If you set find-file-confirm-nonexistent-file to t, then C-x C-f

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4aea9bfb446f79f678e1da0c4ab0dd01b4ed549e..2693e1e27b510ab44181bc69073069d7122c7ba4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * simple.el (set-mark-command): Deactivate mark on second C-SPC C-SPC
+       when using transient-mark-mode.
+
 2008-02-26  Jan Dj\e$(Q)Z\e(Brv  <jan.h.d@swipnet.se>
 
        * progmodes/grep.el (grep-mode-tool-bar-map): Change place on next

diff --git a/lisp/simple.el b/lisp/simple.el
index 0ae64b550b72c73bf34b57ce1ee9f0bc31972cd7..53343dad2b52501038098b240409be4ece895df5 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3499,6 +3499,9 @@ purposes.  See the documentation of `set-mark' for more information."
         mark-active (null transient-mark-mode))
     (setq transient-mark-mode 'lambda)
     (message "Transient-mark-mode temporarily enabled"))
+   ((and (eq last-command 'set-mark-command)
+         transient-mark-mode)
+    (deactivate-mark))
    (t
     (push-mark-command nil))))
 
@@ -4598,7 +4601,6 @@ The variable `selective-display' has a separate value for each buffer."
   (princ "." t))
 
 (defvaralias 'indicate-unused-lines 'indicate-empty-lines)
-(defvaralias 'default-indicate-unused-lines 'default-indicate-empty-lines)
 
 (defun toggle-truncate-lines (&optional arg)
   "Toggle whether to fold or truncate long lines for the current buffer.