comparison lisp/emulation/cua-base.el @ 61642:38e5ee03d4a9

(cua--pre-command-handler): Add more elaborate check for shift modifier on non-window systems.

61641:f108d1ce31f8

	;; If region is not active, region is activated if key is shifted.
	;; If region is active, region is cancelled if key is unshifted (and region not started with C-SPC).
	;; 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)
	      (setq cua--explicit-region-start nil))
	     ((or cua--explicit-region-start cua--rectangle)

61642:38e5ee03d4a9

	;; If region is not active, region is activated if key is shifted.
	;; If region is active, region is cancelled if key is unshifted (and region not started with C-SPC).
	;; 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)
	      (setq cua--explicit-region-start nil))
	     ((or cua--explicit-region-start cua--rectangle)