[Emacs-diffs] Changes to emacs/lisp/frame.el

[Luc Teirlinck]

Index: emacs/lisp/frame.el
diff -c emacs/lisp/frame.el:1.224 emacs/lisp/frame.el:1.225
*** emacs/lisp/frame.el:1.224   Sun Jul 10 16:36:04 2005
--- emacs/lisp/frame.el Tue Jul 12 20:13:23 2005
***************
*** 1256,1261 ****
--- 1256,1266 ----
  This timer calls `blink-cursor-timer-function' every
  `blink-cursor-interval' seconds.")
  
+ ;; At startup, some variables used to compute the standard value may
+ ;; not yet be defined or may not yet have their correct value.  Hence
+ ;; the value computed by the defcustom at startup may be incorrect.
+ ;; The correct value will be recomputed in startup.el using
+ ;; `custom-reevaluate-setting'
  (define-minor-mode blink-cursor-mode
    "Toggle blinking cursor mode.
  With a numeric argument, turn blinking cursor mode on iff ARG is positive.
***************
*** 1266,1275 ****
  displays through a window system, because then Emacs does its own
  cursor display.  On a text-only terminal, this is not implemented."
    :init-value (not (or noninteractive
!                      no-blinking-cursor
                       (eq system-type 'ms-dos)
                       (not (memq window-system '(x w32)))))
-   :initialize 'custom-initialize-safe-default
    :group 'cursor
    :global t
    (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))
--- 1271,1279 ----
  displays through a window system, because then Emacs does its own
  cursor display.  On a text-only terminal, this is not implemented."
    :init-value (not (or noninteractive
!                      (if (boundp 'no-blinking-cursor) no-blinking-cursor)
                       (eq system-type 'ms-dos)
                       (not (memq window-system '(x w32)))))
    :group 'cursor
    :global t
    (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))