[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: |
Mon, 15 Aug 2005 10:10:39 -0400 |
Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.60
emacs/lisp/emulation/cua-base.el:1.61
*** emacs/lisp/emulation/cua-base.el:1.60 Mon Aug 1 14:51:28 2005
--- emacs/lisp/emulation/cua-base.el Mon Aug 15 14:10:39 2005
***************
*** 575,580 ****
--- 575,581 ----
;; Current region was started using cua-set-mark.
(defvar cua--explicit-region-start nil)
+ (make-variable-buffer-local 'cua--explicit-region-start)
;; Latest region was started using shifted movement command.
(defvar cua--last-region-shifted nil)
***************
*** 585,590 ****
--- 586,592 ----
;; status string for mode line indications
(defvar cua--status-string nil)
+ (make-variable-buffer-local 'cua--status-string)
(defvar cua--debug nil)
***************
*** 759,772 ****
(cons (current-buffer)
(and (consp buffer-undo-list)
(car buffer-undo-list))))
! (cua--deactivate)))
(defun cua-replace-region ()
"Replace the active region with the character you type."
(interactive)
! (cua-delete-region)
! (unless (eq this-original-command this-command)
! (cua--fallback)))
(defun cua-copy-region (arg)
"Copy the region to the kill ring.
--- 761,779 ----
(cons (current-buffer)
(and (consp buffer-undo-list)
(car buffer-undo-list))))
! (cua--deactivate)
! (/= start end)))
(defun cua-replace-region ()
"Replace the active region with the character you type."
(interactive)
! (let ((not-empty (cua-delete-region)))
! (unless (eq this-original-command this-command)
! (let ((overwrite-mode
! (and overwrite-mode
! not-empty
! (not (eq this-original-command 'self-insert-command)))))
! (cua--fallback)))))
(defun cua-copy-region (arg)
"Copy the region to the kill ring.
***************
*** 1359,1366 ****
:link '(emacs-commentary-link "cua-base.el")
(setq mark-even-if-inactive t)
(setq highlight-nonselected-windows nil)
- (make-variable-buffer-local 'cua--explicit-region-start)
- (make-variable-buffer-local 'cua--status-string)
(unless cua--keymaps-initalized
(cua--init-keymaps)
--- 1366,1371 ----