comparison lisp/emulation/cua-base.el @ 58963:e1b2a6ac991b

(cua--preserve-mark-commands): Remove. (cua--undo-push-mark): Remove. (cua--pre-command-handler, cua--post-command-handler): Don't fiddle with inhibit-mark-movement.

58962:eb752b1a84b1

Extra commands should be added to `cua-movement-commands'")

(defvar cua-movement-commands nil
  "User may add additional movement commands to this list.")

(defvar cua--preserve-mark-commands
  '(end-of-buffer beginning-of-buffer)
  "List of movement commands that move the mark.
CUA will preserve the previous mark position if a mark is already
active before one of these commands is executed.")

(defvar cua--undo-push-mark nil)

;;; Scrolling commands which does not signal errors at top/bottom
;;; of buffer at first key-press (instead moves to top/bottom
;;; of buffer).

(defun cua-scroll-up (&optional arg)

	    (cond
	     ((memq 'shift (event-modifiers
			    (aref (if window-system
				      (this-single-command-raw-keys)
				    (this-single-command-keys)) 0)))
	      (if mark-active
		  (if (and (memq this-command cua--preserve-mark-commands)
			   (not inhibit-mark-movement))
		      (setq cua--undo-push-mark t
			    inhibit-mark-movement t))
		(push-mark-command nil t))
	      (setq cua--last-region-shifted t)
	      (setq cua--explicit-region-start nil))
	     ((or cua--explicit-region-start cua--rectangle)
	      (unless mark-active

;;; Post-command hook

(defun cua--post-command-handler ()
  (condition-case nil
      (progn
	(when cua--undo-push-mark
	  (setq cua--undo-push-mark nil
		inhibit-mark-movement nil))
	(when cua--global-mark-active
	  (cua--global-mark-post-command))
	(when (fboundp 'cua--rectangle-post-command)
	  (cua--rectangle-post-command))
	(setq cua--buffer-and-point-before-command nil)

58963:e1b2a6ac991b

Extra commands should be added to `cua-movement-commands'")

(defvar cua-movement-commands nil
  "User may add additional movement commands to this list.")

;;; Scrolling commands which does not signal errors at top/bottom
;;; of buffer at first key-press (instead moves to top/bottom
;;; of buffer).

(defun cua-scroll-up (&optional arg)

	    (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)
	      (unless mark-active

;;; Post-command hook

(defun cua--post-command-handler ()
  (condition-case nil
      (progn
	(when cua--global-mark-active
	  (cua--global-mark-post-command))
	(when (fboundp 'cua--rectangle-post-command)
	  (cua--rectangle-post-command))
	(setq cua--buffer-and-point-before-command nil)