From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 25 Apr 2011 18:17:17 +0000 (-0300)
Subject: * lisp/emulation/cua-base.el (cua-selection-mode): Make it toggle again.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~215^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d090ed6c781562b18042321f6780914ad84ffe2d;p=emacs.git

* lisp/emulation/cua-base.el (cua-selection-mode): Make it toggle again.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34e2cc4f56e..35f663ee3e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,14 @@
+2011-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emulation/cua-base.el (cua-selection-mode): Make it toggle again.
+
 2011-04-25  Michael Albinus  <michael.albinus@gmx.de>
 
-	* net/tramp.el (tramp-process-actions): Add POS argument.  Delete
-	region between POS and (pos).
+	* net/tramp.el (tramp-process-actions): Add POS argument.
+	Delete region between POS and (pos).
 
-	* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use
-	`nil' position in `tramp-process-actions' call.
+	* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
+	Use `nil' position in `tramp-process-actions' call.
 	(tramp-maybe-open-connection): Call `tramp-process-actions' with pos.
 
 	* net/tramp-smb.el (tramp-smb-maybe-open-connection): Use `nil'
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 0df9e7b16aa..b643d521ad6 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1627,7 +1627,11 @@ shifted movement key, set `cua-highlight-region-shift-only'."
   "Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings."
   (interactive "P")
   (setq-default cua-enable-cua-keys nil)
-  (cua-mode arg))
+  (if (not (called-interactively-p 'any))
+      (cua-mode arg)
+    ;; Use call-interactive to turn a nil prefix arg into `toggle'.
+    (call-interactively 'cua-mode)
+    (customize-mark-as-set 'cua-enable-cua-keys)))
 
 
 (defun cua-debug ()