Merged from miles@gnu.org--gnu-2005 (patch 296-306)

[gnu-emacs] / lisp / frame.el

diff --git a/lisp/frame.el b/lisp/frame.el
index e581a586b3e27973ad6f8683888b8cb3e4bd2674..25cc5aa38c830310c0a96bb0af8eb7c6540554db 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1341,9 +1341,10 @@ 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 'no-blinking-cursor) no-blinking-cursor)
                       (eq system-type 'ms-dos)
                       (not (memq initial-window-system '(x w32)))))
+  :group 'cursor
   :global t
   (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))
   (if blink-cursor-timer (cancel-timer blink-cursor-timer))