[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el

[Kim F . Storm]

Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.45 
emacs/lisp/emulation/cua-base.el:1.46
*** emacs/lisp/emulation/cua-base.el:1.45       Sat Apr 16 16:03:28 2005
--- emacs/lisp/emulation/cua-base.el    Mon Apr 18 19:50:07 2005
***************
*** 1066,1075 ****
        ;; If rectangle is active, expand rectangle in specified direction and 
ignore the movement.
        (if movement
            (cond
!            ((memq 'shift (event-modifiers
!                           (aref (if window-system
!                                     (this-single-command-raw-keys)
!                                   (this-single-command-keys)) 0)))
              (unless mark-active
                (push-mark-command nil t))
              (setq cua--last-region-shifted t)
--- 1066,1085 ----
        ;; If rectangle is active, expand rectangle in specified direction and 
ignore the movement.
        (if movement
            (cond
!            ((if window-system
!                 (memq 'shift (event-modifiers
!                               (aref (this-single-command-raw-keys) 0)))
!               (or
!                (memq 'shift (event-modifiers
!                              (aref (this-single-command-keys) 0)))
!                ;; See if raw escape sequence maps to a shifted event, e.g. 
S-up or C-S-home.
!                (and (boundp 'function-key-map)
!                     function-key-map
!                     (let ((ev (lookup-key function-key-map
!                                          (this-single-command-raw-keys))))
!                       (and (vector ev)
!                            (symbolp (setq ev (aref ev 0)))
!                            (string-match "S-" (symbol-name ev)))))))
              (unless mark-active
                (push-mark-command nil t))
              (setq cua--last-region-shifted t)