comparison lisp/startup.el @ 2761:26bad513fbb0

(command-line): Call frame-initialize explicitly. Call face-initialize. (normal-top-level): Call frame-notice-user-settings explicitly.
author Richard M. Stallman <rms@gnu.org>
date Thu, 13 May 1993 03:14:39 +0000
parents 844e027dc6db
children d370b253473b
comparison
equal deleted inserted replaced
2760:1c7595e3089b 2761:26bad513fbb0
145 (unwind-protect 145 (unwind-protect
146 (command-line) 146 (command-line)
147 (run-hooks 'emacs-startup-hook) 147 (run-hooks 'emacs-startup-hook)
148 (and term-setup-hook 148 (and term-setup-hook
149 (run-hooks 'term-setup-hook)) 149 (run-hooks 'term-setup-hook))
150 (frame-notice-user-settings)
150 (and window-setup-hook 151 (and window-setup-hook
151 (run-hooks 'window-setup-hook))))) 152 (run-hooks 'window-setup-hook)))))
152 153
153 (defun command-line () 154 (defun command-line ()
154 ;; See if we should import version-control from the environment variable. 155 ;; See if we should import version-control from the environment variable.
209 args (cdr args))) 210 args (cdr args)))
210 (t (setq done t))))) 211 (t (setq done t)))))
211 212
212 ;; Re-attach the program name to the front of the arg list. 213 ;; Re-attach the program name to the front of the arg list.
213 (setcdr command-line-args args)) 214 (setcdr command-line-args args))
215
216 ;; Under X Windows, this creates the X frame and deletes the terminal frame.
217 (frame-initialize)
218
219 (face-initialize)
214 220
215 (run-hooks 'before-init-hook) 221 (run-hooks 'before-init-hook)
216 222
217 ;; Run the site-start library if it exists. The point of this file is 223 ;; Run the site-start library if it exists. The point of this file is
218 ;; that it is run before .emacs. There is no point in doing this after 224 ;; that it is run before .emacs. There is no point in doing this after