From e75e89ba4131339e952dc7628d6b29a31ad377c5 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 13 Apr 2012 09:32:37 -0400 Subject: [PATCH] * lisp/emulation/cua-base.el (cua--pre-command-handler-1): Don't activate the region on shift if the binding is already shifted. Fixes: debbugs:11221 --- lisp/ChangeLog | 5 +++++ lisp/emulation/cua-base.el | 17 +---------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 35caa29f7e1..0a3f3b8f855 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-04-13 Stefan Monnier + + * emulation/cua-base.el (cua--pre-command-handler-1): Don't activate + the region on shift if the binding is already shifted (bug#11221). + 2012-04-12 Glenn Morris * mail/mailpost.el: Move to obsolete/. diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index a918f298a4e..22d80944e5c 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1246,22 +1246,7 @@ If ARG is the atom `-', scroll upward by nearly full screen." ;; (and region not started with C-SPC). ;; If rectangle is active, expand rectangle in specified direction and ;; ignore the movement. - ((if window-system - ;; Shortcut for window-system, assuming that input-decode-map is empty. - (memq 'shift (event-modifiers - (aref (this-single-command-raw-keys) 0))) - (or - ;; Check if the final key-sequence was shifted. - (memq 'shift (event-modifiers - (aref (this-single-command-keys) 0))) - ;; If not, maybe the raw key-sequence was mapped by input-decode-map - ;; to a shifted key (and then mapped down to its unshifted form). - (let* ((keys (this-single-command-raw-keys)) - (ev (lookup-key input-decode-map keys))) - (or (and (vector ev) (memq 'shift (event-modifiers (aref ev 0)))) - ;; Or maybe, the raw key-sequence was not an escape sequence - ;; and was shifted (and then mapped down to its unshifted form). - (memq 'shift (event-modifiers (aref keys 0))))))) + (this-command-keys-shift-translated (unless mark-active (push-mark-command nil t)) (setq cua--last-region-shifted t) -- 2.39.2