[Emacs-diffs] /srv/bzr/emacs/trunk r107888: * lisp/emulation/cua-base.el (cua--pre-command-handler-1): Don't activate

[Stefan Monnier]

------------------------------------------------------------
revno: 107888
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11221
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2012-04-13 09:32:37 -0400
message:
  * lisp/emulation/cua-base.el (cua--pre-command-handler-1): Don't activate
  the region on shift if the binding is already shifted.
modified:
  lisp/ChangeLog
  lisp/emulation/cua-base.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-12 23:47:13 +0000
+++ b/lisp/ChangeLog    2012-04-13 13:32:37 +0000
@@ -1,3 +1,8 @@
+2012-04-13  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/mailpost.el: Move to obsolete/.

=== modified file 'lisp/emulation/cua-base.el'
--- a/lisp/emulation/cua-base.el        2012-03-10 08:26:45 +0000
+++ b/lisp/emulation/cua-base.el        2012-04-13 13:32:37 +0000
@@ -1246,22 +1246,7 @@
    ;;   (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)