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

[Luc Teirlinck]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.337 emacs/lisp/startup.el:1.338
*** emacs/lisp/startup.el:1.337 Mon Jan  3 23:43:34 2005
--- emacs/lisp/startup.el       Sat Feb 12 18:00:53 2005
***************
*** 735,746 ****
                (<= (frame-parameter nil 'tool-bar-lines) 0))
      (tool-bar-mode 1))
  
!   ;; Can't do this init in defcustom because window-system isn't set.
    (unless (or noninteractive
              emacs-quick-startup
                (eq system-type 'ms-dos)
                (not (memq window-system '(x w32))))
-     (setq-default blink-cursor t)
      (blink-cursor-mode 1))
  
    (unless noninteractive
--- 735,748 ----
                (<= (frame-parameter nil 'tool-bar-lines) 0))
      (tool-bar-mode 1))
  
!   ;; 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 window-system '(x w32))))
      (blink-cursor-mode 1))
  
    (unless noninteractive