Mercurial > hg > xemacs-beta

comparison lisp/startup.el @ 863:42375619fa45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-04 06:03:59 by andyp] merge 21.4 windows changes, minimally tested
author andyp
date Tue, 04 Jun 2002 06:05:53 +0000
parents 7778a469a8ac
children 613552a02607
comparison
equal deleted inserted replaced
862:278c743f1578 863:42375619fa45
561 ;; ;; Now we know the user's default font, so add it to the menu. 561 ;; ;; Now we know the user's default font, so add it to the menu.
562 ;; (if (fboundp 'font-menu-add-default) 562 ;; (if (fboundp 'font-menu-add-default)
563 ;; (font-menu-add-default)) 563 ;; (font-menu-add-default))
564 (when window-setup-hook 564 (when window-setup-hook
565 (run-hooks 'window-setup-hook)) 565 (run-hooks 'window-setup-hook))
566 (setq window-setup-hook nil)) 566 (setq window-setup-hook nil)
567 (if error-data
568 ;; re-signal, and don't allow continuation as that will probably
569 ;; wipe out the user's .emacs if she hasn't migrated yet!
570 (signal-error (car error-data) (cdr error-data))))
567 571
568 (if load-user-init-file-p 572 (if load-user-init-file-p
569 (maybe-migrate-user-init-file)) 573 (maybe-migrate-user-init-file))
570 ;; FSF calls precompute-menubar-bindings. We don't mix menubars 574 ;; FSF calls precompute-menubar-bindings. We don't mix menubars
571 ;; and keymaps. 575 ;; and keymaps.
906 (if (not user-init-file) 910 (if (not user-init-file)
907 (setq user-init-file 911 (setq user-init-file
908 (find-user-init-file user-init-directory))) 912 (find-user-init-file user-init-directory)))
909 (if (not custom-file) 913 (if (not custom-file)
910 (setq custom-file (make-custom-file-name user-init-file))) 914 (setq custom-file (make-custom-file-name user-init-file)))
915 ;; #### should test load-user-init-file-p here, not in load-init-file
916 ;; see comment there
911 (if (and user-init-file 917 (if (and user-init-file
912 (file-readable-p user-init-file)) 918 (file-readable-p user-init-file))
913 (load user-init-file t t t)) 919 (load user-init-file t t t))
914 (if (and custom-file 920 (if (and custom-file
915 (or (not user-init-file) 921 (or (not user-init-file)
940 (let (debug-on-error-from-init-file 946 (let (debug-on-error-from-init-file
941 debug-on-error-should-be-set 947 debug-on-error-should-be-set
942 (debug-on-error-initial 948 (debug-on-error-initial
943 (if (eq init-file-debug t) 'startup init-file-debug))) 949 (if (eq init-file-debug t) 'startup init-file-debug)))
944 (let ((debug-on-error debug-on-error-initial)) 950 (let ((debug-on-error debug-on-error-initial))
951 ;; #### I believe this test is incorrect, it leads to custom-file
952 ;; (at least) being undefined
945 (if (and load-user-init-file-p init-file-debug) 953 (if (and load-user-init-file-p init-file-debug)
946 (progn 954 (progn
947 ;; Do this without a condition-case if the user wants to debug. 955 ;; Do this without a condition-case if the user wants to debug.
948 (load-user-init-file)) 956 (load-user-init-file))
949 (condition-case nil 957 (condition-case nil