diff options
| author | Kim F. Storm <storm@cua.dk> | 2005-06-06 13:19:15 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2005-06-06 13:19:15 +0000 |
| commit | 1e98d199cc4865bd1a508214f5d15007f85b254f (patch) | |
| tree | 3068d3e3bdd375d690d2570be95fb539b35f17a4 /lisp/emulation/cua-gmrk.el | |
| parent | c7b96d765214ce3b7176f513fc7fe4f8485945d7 (diff) | |
| download | emacs-1e98d199cc4865bd1a508214f5d15007f85b254f.tar.gz | |
* emulation/cua-base.el (cua-rectangle, cua-rectangle-noselect)
(cua-global-mark): Remove -face suffix from face names.
* emulation/cua-gmrk.el (cua--init-global-mark): Remove
cua-global-mark face setup.
Diffstat (limited to 'lisp/emulation/cua-gmrk.el')
| -rw-r--r-- | lisp/emulation/cua-gmrk.el | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index 8280691ae18..b8874df0f34 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el @@ -74,7 +74,7 @@ (move-overlay cua--global-mark-overlay (point) (1+ (point))) (setq cua--global-mark-overlay (make-overlay (point) (1+ (point)))) - (overlay-put cua--global-mark-overlay 'face 'cua-global-mark-face)) + (overlay-put cua--global-mark-overlay 'face 'cua-global-mark)) (if (and cua-global-mark-blink-cursor-interval (not cua--orig-blink-cursor-interval)) (setq cua--orig-blink-cursor-interval blink-cursor-interval @@ -218,7 +218,7 @@ With prefix argument, don't jump to global mark when cancelling it." (let ((olist (overlays-at (marker-position cua--global-mark-marker))) in-rect) (while olist - (if (eq (overlay-get (car olist) 'face) 'cua-rectangle-face) + (if (eq (overlay-get (car olist) 'face) 'cua-rectangle) (setq in-rect t olist nil) (setq olist (cdr olist)))) (if in-rect @@ -358,11 +358,6 @@ With prefix argument, don't jump to global mark when cancelling it." ;;; Initialization (defun cua--init-global-mark () - (unless (face-background 'cua-global-mark-face) - (copy-face 'region 'cua-global-mark-face) - (set-face-foreground 'cua-global-mark-face "black") - (set-face-background 'cua-global-mark-face "cyan")) - (define-key cua--global-mark-keymap [remap copy-region-as-kill] 'cua-copy-to-global-mark) (define-key cua--global-mark-keymap [remap kill-ring-save] 'cua-copy-to-global-mark) (define-key cua--global-mark-keymap [remap kill-region] 'cua-cut-to-global-mark) |