[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: |
Wed, 01 May 2002 10:22:06 -0400 |
Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.2
emacs/lisp/emulation/cua-base.el:1.3
*** emacs/lisp/emulation/cua-base.el:1.2 Tue Apr 30 09:12:33 2002
--- emacs/lisp/emulation/cua-base.el Wed May 1 10:22:06 2002
***************
*** 875,901 ****
(setq deactivate-mark t)))
;; Handle delete-selection property on other commands
! (let* ((ds (or (get this-command 'delete-selection)
! (get this-command 'pending-delete)))
! (nc (cond
! ((eq ds 'yank)
! 'cua-paste)
! ((eq ds 'kill)
! (if cua--rectangle
! 'cua-copy-rectangle
! 'cua-copy-region))
! ((eq ds 'supersede)
! (if cua--rectangle
! 'cua-delete-rectangle ;; replace?
! 'cua-replace-region))
! (ds
! (if cua--rectangle
! 'cua-delete-rectangle
! 'cua-delete-region))
! (t nil))))
! (if nc
! (setq this-original-command this-command
! this-command nc))))
;; Detect extension of rectangles by mouse or other movement
(setq cua--buffer-and-point-before-command
--- 875,902 ----
(setq deactivate-mark t)))
;; Handle delete-selection property on other commands
! (if (and mark-active (not deactivate-mark))
! (let* ((ds (or (get this-command 'delete-selection)
! (get this-command 'pending-delete)))
! (nc (cond
! ((not ds) nil)
! ((eq ds 'yank)
! 'cua-paste)
! ((eq ds 'kill)
! (if cua--rectangle
! 'cua-copy-rectangle
! 'cua-copy-region))
! ((eq ds 'supersede)
! (if cua--rectangle
! 'cua-delete-rectangle ;; replace?
! 'cua-replace-region))
! (t
! (if cua--rectangle
! 'cua-delete-rectangle
! 'cua-delete-region)))))
! (if nc
! (setq this-original-command this-command
! this-command nc)))))
;; Detect extension of rectangles by mouse or other movement
(setq cua--buffer-and-point-before-command
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el,
Kim F. Storm <=
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el, Kim F. Storm, 2002/05/01
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el, Kim F. Storm, 2002/05/10
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el, Kim F. Storm, 2002/05/10
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el, Kim F. Storm, 2002/05/13
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el, Kim F. Storm, 2002/05/24
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el, Kim F. Storm, 2002/05/25
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el, Kim F. Storm, 2002/05/27
- [Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el, Kim F. Storm, 2002/05/31