[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: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el |
Date: |
Fri, 18 Apr 2003 18:49:21 -0400 |
Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.23
emacs/lisp/emulation/cua-base.el:1.24
*** emacs/lisp/emulation/cua-base.el:1.23 Mon Mar 31 16:48:39 2003
--- emacs/lisp/emulation/cua-base.el Fri Apr 18 18:49:20 2003
***************
*** 260,288 ****
:link '(emacs-commentary-link :tag "Commentary" "cua-base.el")
:link '(emacs-library-link :tag "Lisp File" "cua-base.el"))
- ;;;###autoload
- (defcustom cua-mode nil
- "Non-nil means that CUA emulation mode is enabled.
- In CUA mode, shifted movement keys highlight and extend the region.
- When a region is highlighted, the binding of the C-x and C-c keys are
- temporarily changed to work as Motif, MAC or MS-Windows cut and paste.
- Also, insertion commands first delete the region and then insert.
- This mode enables Transient Mark mode and it provides a superset of the
- PC Selection Mode and Delete Selection Modes.
-
- Setting this variable directly does not take effect;
- use either \\[customize] or the function `cua-mode'."
- :set (lambda (symbol value)
- (cua-mode (or value 0)))
- :initialize 'custom-initialize-default
- :set-after '(cua-enable-modeline-indications cua-use-hyper-key)
- :require 'cua-base
- :link '(emacs-commentary-link "cua-base.el")
- :version "21.4"
- :type 'boolean
- :group 'cua)
-
-
(defcustom cua-enable-cua-keys t
"*Enable using C-z, C-x, C-c, and C-v for undo, cut, copy, and paste.
If the value is t, these mappings are always enabled. If the value is
--- 260,265 ----
***************
*** 405,413 ****
:group 'cua)
(defface cua-global-mark-face '((((class color))
! (:foreground "black")
! (:background "yellow"))
! (t (:bold t)))
"*Font used by CUA for highlighting the global mark."
:group 'cua)
--- 382,390 ----
:group 'cua)
(defface cua-global-mark-face '((((class color))
! :foreground "black"
! :background "yellow")
! (t :bold t))
"*Font used by CUA for highlighting the global mark."
:group 'cua)
***************
*** 1181,1199 ****
(defvar cua--saved-state nil)
;;;###autoload
! (defun cua-mode (&optional arg)
"Toggle CUA key-binding mode.
When enabled, using shifted movement keys will activate the region (and
highlight the region using `transient-mark-mode'), and typed text replaces
the active selection. C-z, C-x, C-c, and C-v will undo, cut, copy, and
paste (in addition to the normal emacs bindings)."
! (interactive "P")
! (setq cua-mode
! (cond
! ((null arg) (not cua-mode))
! ((symbolp arg) t)
! (t (> (prefix-numeric-value arg) 0))))
!
(setq mark-even-if-inactive t)
(setq highlight-nonselected-windows nil)
(make-variable-buffer-local 'cua--explicit-region-start)
--- 1158,1174 ----
(defvar cua--saved-state nil)
;;;###autoload
! (define-minor-mode cua-mode
"Toggle CUA key-binding mode.
When enabled, using shifted movement keys will activate the region (and
highlight the region using `transient-mark-mode'), and typed text replaces
the active selection. C-z, C-x, C-c, and C-v will undo, cut, copy, and
paste (in addition to the normal emacs bindings)."
! :global t
! :set-after '(cua-enable-modeline-indications cua-use-hyper-key)
! :require 'cua-base
! :link '(emacs-commentary-link "cua-base.el")
! :version "21.4"
(setq mark-even-if-inactive t)
(setq highlight-nonselected-windows nil)
(make-variable-buffer-local 'cua--explicit-region-start)
***************
*** 1235,1243 ****
(setq transient-mark-mode (and cua-mode
(if cua-highlight-region-shift-only
(not cua--explicit-region-start)
! t)))
! (if (interactive-p)
! (message "CUA mode enabled")))
(cua--saved-state
(setq transient-mark-mode (car cua--saved-state))
(if (nth 1 cua--saved-state)
--- 1210,1216 ----
(setq transient-mark-mode (and cua-mode
(if cua-highlight-region-shift-only
(not cua--explicit-region-start)
! t))))
(cua--saved-state
(setq transient-mark-mode (car cua--saved-state))
(if (nth 1 cua--saved-state)
***************
*** 1250,1260 ****
(if (and (nth 1 cua--saved-state) (nth 2 cua--saved-state)) "
and" "")
(if (nth 2 cua--saved-state) " PC-Selection" "")
(if (or (nth 1 cua--saved-state) (nth 2 cua--saved-state)) "
enabled" "")))
! (setq cua--saved-state nil))
!
! (t
! (if (interactive-p)
! (message "CUA mode disabled")))))
(defun cua-debug ()
"Toggle cua debugging."
--- 1223,1229 ----
(if (and (nth 1 cua--saved-state) (nth 2 cua--saved-state)) "
and" "")
(if (nth 2 cua--saved-state) " PC-Selection" "")
(if (or (nth 1 cua--saved-state) (nth 2 cua--saved-state)) "
enabled" "")))
! (setq cua--saved-state nil))))
(defun cua-debug ()
"Toggle cua debugging."