Mercurial > emacs
comparison lisp/startup.el @ 90197:b7da78284d4c
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-65
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 425-445)
- Remove "-face" suffix from gnus faces
- Update from CVS
- Remove "-face" suffix from MH-E faces
- Remove "-face" suffix from cc-mode faces
- Remove "-face" suffix from eshell faces
- Remove "-face" suffix from ediff faces
- Implement tty vertical-divider face
- Rename vertical-divider face to vertical-border
- Change escape-glyph color on dark backgrounds back to cyan
- Update reference to renamed Buffer-menu-buffer face
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 24 Jun 2005 01:59:52 +0000 |
parents | 5b029ff3b08d 977d18df13bb |
children | bb71c6cf2009 |
comparison
equal
deleted
inserted
replaced
90196:82d495f87e7b | 90197:b7da78284d4c |
---|---|
795 | 795 |
796 ;; Sites should not disable this. Only individuals should disable | 796 ;; Sites should not disable this. Only individuals should disable |
797 ;; the startup message. | 797 ;; the startup message. |
798 (setq inhibit-startup-message nil) | 798 (setq inhibit-startup-message nil) |
799 | 799 |
800 ;; Warn for invalid user name. | |
801 (and init-file-user | |
802 (not (file-directory-p (expand-file-name (concat "~" init-file-user)))) | |
803 (display-warning 'initialization | |
804 (format "User %s has no home directory" | |
805 init-file-user) | |
806 :error)) | |
807 | |
800 ;; Load that user's init file, or the default one, or none. | 808 ;; Load that user's init file, or the default one, or none. |
801 (let (debug-on-error-from-init-file | 809 (let (debug-on-error-from-init-file |
802 debug-on-error-should-be-set | 810 debug-on-error-should-be-set |
803 (debug-on-error-initial | 811 (debug-on-error-initial |
804 (if (eq init-file-debug t) 'startup init-file-debug)) | 812 (if (eq init-file-debug t) 'startup init-file-debug)) |