[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el

[Kim F. Storm]

Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.13 
emacs/lisp/emulation/cua-base.el:1.14
*** emacs/lisp/emulation/cua-base.el:1.13       Fri Jun 21 09:56:13 2002
--- emacs/lisp/emulation/cua-base.el    Sun Oct  6 17:34:07 2002
***************
*** 425,444 ****
    :type 'boolean
    :group 'cua)
  
! (defcustom cua-normal-cursor-color nil
    "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))))
    :type 'color
    :group 'cua)
  
--- 425,443 ----
    :type 'boolean
    :group 'cua)
  
! (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.
! Default is to load cursor color from initial or default frame parameters."
!   :initialize 'custom-initialize-default
    :type 'color
    :group 'cua)