diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-04-25 15:17:17 -0300 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-04-25 15:17:17 -0300 |
| commit | d090ed6c781562b18042321f6780914ad84ffe2d (patch) | |
| tree | 4587021bf2b97dbcc8f8873f2a78bc54093098de /lisp | |
| parent | 69026abaa5924545051086104b3073f860aca36c (diff) | |
| download | emacs-d090ed6c781562b18042321f6780914ad84ffe2d.tar.gz | |
* lisp/emulation/cua-base.el (cua-selection-mode): Make it toggle again.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/emulation/cua-base.el | 6 |
2 files changed, 13 insertions, 5 deletions
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 () |