Mercurial > emacs

diff lisp/startup.el @ 83253:c0215e820840

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 91-94) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-91 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-92 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-93 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-94 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-293
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 18 Feb 2005 23:21:20 +0000
parents 3dcba0bc766b 67919735cf64
children 1f334cdd7020
line wrap: on
line diff
--- a/lisp/startup.el	Sat Feb 12 15:11:25 2005 +0000
+++ b/lisp/startup.el	Fri Feb 18 23:21:20 2005 +0000
@@ -742,12 +742,14 @@
               (<= (frame-parameter nil 'tool-bar-lines) 0))
     (tool-bar-mode 1))
 
-  ;; Can't do this init in defcustom because initial-window-system isn't set.
+  ;; Can't do this init in defcustom because the relevant variables
+  ;; are not set.  If you make any changes to the `or' form below,
+  ;; you should also change the corresponding expression in the
+  ;; defcustom in frame.el, or Custom will be badly confused.
   (unless (or noninteractive
 	      emacs-quick-startup
               (eq system-type 'ms-dos)
               (not (memq initial-window-system '(x w32))))
-    (setq-default blink-cursor t)
     (blink-cursor-mode 1))
 
   (unless noninteractive