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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34e2cc4f56e9f71a29a1225c71e0182e13566773..35f663ee3e57a75c252aaac59e5f65b4adf62295 100644 (file)
--- 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 0df9e7b16aaccccdab00fc617738b60c34d62a7a..b643d521ad6f8d0ca466bfa2cbb0b3477b0c4beb 100644 (file)
--- 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 ()