Mercurial > hg > xemacs-beta

comparison lisp/startup.el @ 2305:69a0933b86f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-09-23 05:44:35 by stephent] Fix Malcolm's address <877jql7dou.fsf_-_@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Thu, 23 Sep 2004 05:44:37 +0000
parents 488b2f76d852
children f4e405a9d18d
comparison
equal deleted inserted replaced
2304:7fc13d0eacd5 2305:69a0933b86f1
896 (if (not user-init-file) 896 (if (not user-init-file)
897 (setq user-init-file 897 (setq user-init-file
898 (find-user-init-file user-init-directory))) 898 (find-user-init-file user-init-directory)))
899 (if (not custom-file) 899 (if (not custom-file)
900 (setq custom-file (make-custom-file-name user-init-file))) 900 (setq custom-file (make-custom-file-name user-init-file)))
901 ;; #### should test load-user-init-file-p here, not in load-init-file
902 ;; see comment there
903 (if (and user-init-file 901 (if (and user-init-file
904 (file-readable-p user-init-file)) 902 (file-readable-p user-init-file))
905 (load user-init-file t t t)) 903 (load user-init-file t t t))
906 (if (and custom-file 904 (if (and custom-file
907 (or (not user-init-file) 905 (or (not user-init-file)
935 (let (debug-on-error-from-init-file 933 (let (debug-on-error-from-init-file
936 debug-on-error-should-be-set 934 debug-on-error-should-be-set
937 (debug-on-error-initial 935 (debug-on-error-initial
938 (if (eq init-file-debug t) 'startup init-file-debug))) 936 (if (eq init-file-debug t) 'startup init-file-debug)))
939 (let ((debug-on-error debug-on-error-initial)) 937 (let ((debug-on-error debug-on-error-initial))
940 ;; #### I believe this test is incorrect, it leads to custom-file
941 ;; (at least) being undefined
942 (if (and load-user-init-file-p init-file-debug) 938 (if (and load-user-init-file-p init-file-debug)
943 (progn 939 (progn
944 ;; Do this without a condition-case if the user wants to debug. 940 ;; Do this without a condition-case if the user wants to debug.
945 (load-user-init-file)) 941 (load-user-init-file))
946 (condition-case nil 942 (condition-case nil