(blink-cursor-mode): `emacs-quick-startup' may not be bound yet.

2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8964538ee3e..56c3937b564 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * frame.el (blink-cursor-mode): `emacs-quick-startup' may not be
+        bound yet.
+
 2005-03-02  Romain Francoise  <romain@orebokech.com>
 
         * ibuf-ext.el (ibuffer-filter-disable): Move back to the current
@@ -52,8 +57,7 @@
         (debugger-setup-buffer): Delete one more frame line in case of
         debug on entry.
         (debugger-frame-number): Update to use the new text introduced by
-        the 1999-11-03 change.  Skip one more frame in case of debug on
-        entry.
+        the 1999-11-03 change.  Skip one more frame in case of debug on entry.
 
 2005-02-28  Kim F. Storm  <storm@cua.dk>
 
diff --git a/lisp/frame.el b/lisp/frame.el
index 6e04537731d..2b33617e062 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1270,7 +1270,7 @@ Note that this command is effective only when Emacs
 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
-                       emacs-quick-startup
+                       (if (boundp 'emacs-quick-startup) emacs-quick-startup)
                        (eq system-type 'ms-dos)
                        (not (memq window-system '(x w32)))))
   :group 'cursor