summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2002-10-06 21:34:07 +0000
committerKim F. Storm <storm@cua.dk>2002-10-06 21:34:07 +0000
commit9824cf96ce4db7f2a55c2a1f7179ce79ef10e28a (patch)
tree94e9b159a24d6d862d3ca0fca0340beb47d5cfac /lisp/emulation
parentdf1846fd4861f8da9cf2bc4451265346743ff5e6 (diff)
downloademacs-9824cf96ce4db7f2a55c2a1f7179ce79ef10e28a.tar.gz
(cua-normal-cursor-color): Fixed
initialization to make "Erase Customization" work.
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/cua-base.el23
1 files changed, 11 insertions, 12 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index c906690356d..5f8fc8533da 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -425,20 +425,19 @@ Can be toggled by [M-p] while the rectangle is active,"
:type 'boolean
:group 'cua)
-(defcustom cua-normal-cursor-color nil
+(defcustom cua-normal-cursor-color (or (and (boundp 'initial-cursor-color) initial-cursor-color)
+ (and (boundp 'initial-frame-alist)
+ (assoc 'cursor-color initial-frame-alist)
+ (cdr (assoc 'cursor-color initial-frame-alist)))
+ (and (boundp 'default-frame-alist)
+ (assoc 'cursor-color default-frame-alist)
+ (cdr (assoc 'cursor-color default-frame-alist)))
+ (frame-parameter nil 'cursor-color)
+ "red")
"Normal (non-overwrite) cursor color.
Also used to indicate that rectangle padding is not in effect.
-Automatically loaded from frame parameters, if nil."
- :initialize (lambda (symbol value)
- (set symbol (or value
- (and (boundp 'initial-cursor-color) initial-cursor-color)
- (and (boundp 'initial-frame-alist)
- (assoc 'cursor-color initial-frame-alist)
- (cdr (assoc 'cursor-color initial-frame-alist)))
- (and (boundp 'default-frame-alist)
- (assoc 'cursor-color default-frame-alist)
- (cdr (assoc 'cursor-color default-frame-alist)))
- (frame-parameter nil 'cursor-color))))
+Default is to load cursor color from initial or default frame parameters."
+ :initialize 'custom-initialize-default
:type 'color
:group 'cua)