[Emacs-diffs] /srv/bzr/emacs/trunk r104010: * lisp/emulation/cua-base.el (cua-selection-mode): Make it toggle again.

[Stefan Monnier]

------------------------------------------------------------
revno: 104010
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-04-25 15:17:17 -0300
message:
  * lisp/emulation/cua-base.el (cua-selection-mode): Make it toggle again.
modified:
  lisp/ChangeLog
  lisp/emulation/cua-base.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-25 18:10:17 +0000
+++ b/lisp/ChangeLog    2011-04-25 18:17:17 +0000
@@ -1,10 +1,14 @@
+2011-04-25  Stefan Monnier  <address@hidden>
+
+       * emulation/cua-base.el (cua-selection-mode): Make it toggle again.
+
 2011-04-25  Michael Albinus  <address@hidden>
 
-       * 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'

=== modified file 'lisp/emulation/cua-base.el'
--- a/lisp/emulation/cua-base.el        2011-02-18 08:17:20 +0000
+++ b/lisp/emulation/cua-base.el        2011-04-25 18:17:17 +0000
@@ -1627,7 +1627,11 @@
   "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 ()