comparison lisp/startup.el @ 83253:c0215e820840

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
comparison
equal deleted inserted replaced
83252:6e0f153725ab 83253:c0215e820840
740 emacs-quick-startup 740 emacs-quick-startup
741 (not (display-graphic-p)) 741 (not (display-graphic-p))
742 (<= (frame-parameter nil 'tool-bar-lines) 0)) 742 (<= (frame-parameter nil 'tool-bar-lines) 0))
743 (tool-bar-mode 1)) 743 (tool-bar-mode 1))
744 744
745 ;; Can't do this init in defcustom because initial-window-system isn't set. 745 ;; Can't do this init in defcustom because the relevant variables
746 ;; are not set. If you make any changes to the `or' form below,
747 ;; you should also change the corresponding expression in the
748 ;; defcustom in frame.el, or Custom will be badly confused.
746 (unless (or noninteractive 749 (unless (or noninteractive
747 emacs-quick-startup 750 emacs-quick-startup
748 (eq system-type 'ms-dos) 751 (eq system-type 'ms-dos)
749 (not (memq initial-window-system '(x w32)))) 752 (not (memq initial-window-system '(x w32))))
750 (setq-default blink-cursor t)
751 (blink-cursor-mode 1)) 753 (blink-cursor-mode 1))
752 754
753 (unless noninteractive 755 (unless noninteractive
754 ;; DOS/Windows systems have a PC-type keyboard which has both 756 ;; DOS/Windows systems have a PC-type keyboard which has both
755 ;; <delete> and <backspace> keys. 757 ;; <delete> and <backspace> keys.