mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

(cua-delete-region): Return t if

Browse Source 
deleted region was non-empty.
(cua-replace-region): Inhibit overwrite-mode for
self-insert-command if replaced region was non-empty.
(cua--explicit-region-start, cua--status-string): Make them
buffer-local at top-level...
(cua-mode): ...rather than when mode is enabled.
This commit is contained in:
Kim F. Storm 2005-08-15 14:10:39 +00:00
parent fb90e6d951
commit ecd6106722
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/emulation/cua-base.el
View File

@ -575,6 +575,7 @@ a cons (TYPE . COLOR), then both properties are affected."
;; Current region was started using cua-set-mark. ;; Current region was started using cua-set-mark.
(defvar cua--explicit-region-start nil) (defvar cua--explicit-region-start nil)
(make-variable-buffer-local 'cua--explicit-region-start)
;; Latest region was started using shifted movement command. ;; Latest region was started using shifted movement command.
(defvar cua--last-region-shifted nil) (defvar cua--last-region-shifted nil)
@ -585,6 +586,7 @@ a cons (TYPE . COLOR), then both properties are affected."
;; status string for mode line indications ;; status string for mode line indications
(defvar cua--status-string nil) (defvar cua--status-string nil)
(make-variable-buffer-local 'cua--status-string)
(defvar cua--debug nil) (defvar cua--debug nil)
@ -759,14 +761,19 @@ Save a copy in register 0 if `cua-delete-copy-to-register-0' is non-nil."
(cons (current-buffer) (cons (current-buffer)
(and (consp buffer-undo-list) (and (consp buffer-undo-list)
(car buffer-undo-list)))) (car buffer-undo-list))))
(cua--deactivate))) (cua--deactivate)
(/= start end)))
(defun cua-replace-region () (defun cua-replace-region ()
"Replace the active region with the character you type." "Replace the active region with the character you type."
(interactive) (interactive)
(cua-delete-region) (let ((not-empty (cua-delete-region)))
(unless (eq this-original-command this-command) (unless (eq this-original-command this-command)
(cua--fallback))) (let ((overwrite-mode
(and overwrite-mode
not-empty
(not (eq this-original-command 'self-insert-command)))))
(cua--fallback)))))
(defun cua-copy-region (arg) (defun cua-copy-region (arg)
"Copy the region to the kill ring. "Copy the region to the kill ring.
@ -1359,8 +1366,6 @@ the prefix fallback behavior."
:link '(emacs-commentary-link "cua-base.el") :link '(emacs-commentary-link "cua-base.el")
(setq mark-even-if-inactive t) (setq mark-even-if-inactive t)
(setq highlight-nonselected-windows nil) (setq highlight-nonselected-windows nil)
(make-variable-buffer-local 'cua--explicit-region-start)
(make-variable-buffer-local 'cua--status-string)
(unless cua--keymaps-initalized (unless cua--keymaps-initalized
(cua--init-keymaps) (cua--init-keymaps)