summaryrefslogtreecommitdiff
path: root/lisp/emulation/cua-gmrk.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-12-08 01:24:54 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2013-12-08 01:24:54 -0500
commit6f8dfccfe3ec3e1137e712b49da12c8a9ab4bc85 (patch)
treeebe79741b1a81433ff73bd666e07626c1982bfbb /lisp/emulation/cua-gmrk.el
parent95b3d095f8791c9d0a2007f43fa4731401c64c87 (diff)
downloademacs-6f8dfccfe3ec3e1137e712b49da12c8a9ab4bc85.tar.gz
Use delete-selection-mode in cua-mode.
* lisp/emulation/cua-base.el (cua--prefix-copy-handler) (cua--prefix-cut-handler): Rely on region-extract-function rather than checking cua--rectangle. (cua-delete-region): Use region-extract-function. (cua-replace-region): Delete function. (cua-copy-region, cua-cut-region): Obey region-extract-function. (cua--pre-command-handler-1): Don't do the delete-selection thing. (cua--self-insert-char-p): Ignore `self-insert-iso'. (cua--init-keymaps): Don't remap delete-selection commands. (cua-mode): Use delete-selection-mode instead of rolling our own. * lisp/emulation/cua-rect.el (cua--rectangle-region-extract): New function. (region-extract-function): Use it. (cua-mouse-save-then-kill-rectangle): Use cua-copy-region. (cua-copy-rectangle, cua-cut-rectangle, cua-delete-rectangle): Delete functions. (cua--init-rectangles): Don't re-remap copy-region-as-kill, kill-ring-save, kill-region, delete-char, delete-forward-char. Ignore self-insert-iso. * lisp/menu-bar.el (clipboard-kill-ring-save, clipboard-kill-region): Obey region-extract-function. * lisp/emulation/cua-gmrk.el (cua--init-global-mark): Ignore `self-insert-iso'. Fixes: debbugs:16085
Diffstat (limited to 'lisp/emulation/cua-gmrk.el')
-rw-r--r--lisp/emulation/cua-gmrk.el1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index 78665624946..5554a7b6f01 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -362,7 +362,6 @@ With prefix argument, don't jump to global mark when canceling it."
(define-key cua--global-mark-keymap [remap backward-delete-char] 'cua-delete-backward-char-at-global-mark)
(define-key cua--global-mark-keymap [remap backward-delete-char-untabify] 'cua-delete-backward-char-at-global-mark)
(define-key cua--global-mark-keymap [remap self-insert-command] 'cua-insert-char-at-global-mark)
- (define-key cua--global-mark-keymap [remap self-insert-iso] 'cua-insert-char-at-global-mark)
;; Catch self-inserting characters which are "stolen" by other modes
(define-key cua--global-mark-keymap [t]