Mercurial > emacs
diff lisp/startup.el @ 83098:0643dc72a250
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-213
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-214
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-215
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-216
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-217
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-138
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 15 Apr 2004 16:49:22 +0000 |
parents | 34a7a8f40548 dd005a791c40 |
children | 24e9d5ea9a88 |
line wrap: on
line diff
--- a/lisp/startup.el Tue Apr 13 18:18:05 2004 +0000 +++ b/lisp/startup.el Thu Apr 15 16:49:22 2004 +0000 @@ -274,6 +274,8 @@ string) :group 'auto-save) +(defvar emacs-quick-startup nil) + (defvar init-file-debug nil) (defvar init-file-had-error nil) @@ -690,6 +692,11 @@ (setq argval nil argi orig-argi))))) (cond + ((equal argi "-Q") + (setq init-file-user nil + site-run-file nil + emacs-quick-startup t) + (push '(vertical-scroll-bars . nil) initial-frame-alist)) ((member argi '("-q" "-no-init-file")) (setq init-file-user nil)) ((member argi '("-u" "-user")) @@ -721,18 +728,21 @@ ;; If frame was created with a menu bar, set menu-bar-mode on. (unless (or noninteractive + emacs-quick-startup (and (memq initial-window-system '(x w32)) (<= (frame-parameter nil 'menu-bar-lines) 0))) (menu-bar-mode 1)) ;; If frame was created with a tool bar, switch tool-bar-mode on. (unless (or noninteractive + emacs-quick-startup (not (display-graphic-p)) (<= (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. (unless (or noninteractive + emacs-quick-startup (eq system-type 'ms-dos) (not (memq initial-window-system '(x w32)))) (setq-default blink-cursor t) @@ -754,6 +764,7 @@ (normal-erase-is-backspace-mode 1))) (unless (or noninteractive + emacs-quick-startup (not (display-graphic-p)) (not (fboundp 'x-show-tip))) (setq-default tooltip-mode t) @@ -1106,8 +1117,8 @@ (when img (when (> window-width image-width) ;; Center the image in the window. - (let ((pos (/ (- window-width image-width) 2))) - (insert (propertize " " 'display `(space :align-to ,pos)))) + (insert (propertize " " 'display + `(space :align-to (+ center (-0.5 . ,img))))) ;; Change the color of the XPM version of the splash image ;; so that it is visible with a dark frame background. @@ -1656,11 +1667,13 @@ (list-buffers))))) ;; Maybe display a startup screen. - (when (and (not inhibit-startup-message) (not noninteractive) + (unless (or inhibit-startup-message + noninteractive + emacs-quick-startup ;; Don't display startup screen if init file ;; has started some sort of server. - (not (and (fboundp 'process-list) - (process-list)))) + (and (fboundp 'process-list) + (process-list))) ;; Display a startup screen, after some preparations. ;; If there are no switches to process, we might as well