[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el |
Date: |
Fri, 28 Oct 2005 11:43:17 -0400 |
Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.381 emacs/lisp/startup.el:1.382
*** emacs/lisp/startup.el:1.381 Fri Oct 21 17:20:45 2005
--- emacs/lisp/startup.el Fri Oct 28 15:43:15 2005
***************
*** 731,736 ****
--- 731,738 ----
(and command-line-args
(setcdr command-line-args args)))
+ (run-hooks 'before-init-hook)
+
;; Under X Window, this creates the X frame and deletes the terminal frame.
(when (fboundp 'frame-initialize)
(frame-initialize))
***************
*** 788,795 ****
(old-font-list-limit font-list-limit)
(old-face-ignored-fonts face-ignored-fonts))
- (run-hooks 'before-init-hook)
-
;; Run the site-start library if it exists. The point of this file is
;; that it is run before .emacs. There is no point in doing this after
;; .emacs; that is useless.
--- 790,795 ----
***************
*** 801,812 ****
(setq inhibit-startup-message nil)
;; Warn for invalid user name.
! (and init-file-user
! (not (file-directory-p (expand-file-name (concat "~" init-file-user))))
! (display-warning 'initialization
! (format "User %s has no home directory"
! init-file-user)
! :error))
;; Load that user's init file, or the default one, or none.
(let (debug-on-error-from-init-file
--- 801,818 ----
(setq inhibit-startup-message nil)
;; Warn for invalid user name.
! (when init-file-user
! (if (string-match "[~/:\n]" init-file-user)
! (display-warning 'initialization
! (format "Invalid user name %s"
! init-file-user)
! :error)
! (if (file-directory-p (expand-file-name (concat "~" init-file-user)))
! nil
! (display-warning 'initialization
! (format "User %s has no home directory"
! init-file-user)
! :error))))
;; Load that user's init file, or the default one, or none.
(let (debug-on-error-from-init-file