[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el |
Date: |
Fri, 16 Jul 2004 06:45:31 -0400 |
Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.33
emacs/lisp/emulation/cua-base.el:1.34
*** emacs/lisp/emulation/cua-base.el:1.33 Mon May 3 14:26:23 2004
--- emacs/lisp/emulation/cua-base.el Fri Jul 16 10:42:26 2004
***************
*** 974,979 ****
--- 974,986 ----
(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
***************
*** 1062,1069 ****
;; If rectangle is active, expand rectangle in specified direction and
ignore the movement.
(if movement
(cond
! ((memq 'shift (event-modifiers (aref
(this-single-command-raw-keys) 0)))
! (unless mark-active
(push-mark-command nil t))
(setq cua--last-region-shifted t)
(setq cua--explicit-region-start nil))
--- 1069,1083 ----
;; 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)))
! (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))
***************
*** 1110,1115 ****
--- 1124,1132 ----
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el,
Kim F . Storm <=