projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
lisp
/
startup.el
diff --git
a/lisp/startup.el
b/lisp/startup.el
index
4ced980
..
0a495e4
100644
(file)
--- a/
lisp/startup.el
+++ b/
lisp/startup.el
@@
-438,8
+438,11
@@
Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n")
(packages-load-package-auto-autoloads late-package-load-path)
(packages-load-package-auto-autoloads last-package-load-path)))
(packages-load-package-auto-autoloads late-package-load-path)
(packages-load-package-auto-autoloads last-package-load-path)))
- (unwind-protect
- (command-line)
+ (let (error-data)
+ (condition-case data
+ (command-line)
+ ;; catch non-error signals, especially quit
+ (t (setq error-data data)))
;; Do this again, in case the init file defined more abbreviations.
(setq default-directory (abbreviate-file-name default-directory))
;; Specify the file for recording all the auto save files of
;; Do this again, in case the init file defined more abbreviations.
(setq default-directory (abbreviate-file-name default-directory))
;; Specify the file for recording all the auto save files of
@@
-464,7
+467,11
@@
Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n")
;; (font-menu-add-default))
(when window-setup-hook
(run-hooks 'window-setup-hook))
;; (font-menu-add-default))
(when window-setup-hook
(run-hooks 'window-setup-hook))
- (setq window-setup-hook nil))
+ (setq window-setup-hook nil)
+ (if error-data
+ ;; re-signal, and don't allow continuation as that will probably
+ ;; wipe out the user's .emacs if she hasn't migrated yet!
+ (signal-error (car error-data) (cdr error-data))))
(if load-user-init-file-p
(maybe-migrate-user-init-file))
(if load-user-init-file-p
(maybe-migrate-user-init-file))
@@
-556,6
+563,7
@@
Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n")
(push (pop args) new-args)))
(t (push arg new-args))))
(push (pop args) new-args)))
(t (push arg new-args))))
+ ;; obsolete, initialize for backward compatibility
(setq init-file-user (and load-user-init-file-p ""))
(nreverse new-args)))
(setq init-file-user (and load-user-init-file-p ""))
(nreverse new-args)))
@@
-790,6
+798,8
@@
directory which will load the relocated initialization code.")
(find-user-init-file user-init-directory)))
(if (not custom-file)
(setq custom-file (make-custom-file-name user-init-file)))
(find-user-init-file user-init-directory)))
(if (not custom-file)
(setq custom-file (make-custom-file-name user-init-file)))
+ ;; #### should test load-user-init-file-p here, not in load-init-file
+ ;; see comment there
(if (and user-init-file
(file-readable-p user-init-file))
(load user-init-file t t t))
(if (and user-init-file
(file-readable-p user-init-file))
(load user-init-file t t t))
@@
-824,12
+834,15
@@
directory which will load the relocated initialization code.")
(debug-on-error-initial
(if (eq init-file-debug t) 'startup init-file-debug)))
(let ((debug-on-error debug-on-error-initial))
(debug-on-error-initial
(if (eq init-file-debug t) 'startup init-file-debug)))
(let ((debug-on-error debug-on-error-initial))
+ ;; #### I believe this test is incorrect, it leads to custom-file
+ ;; (at least) being undefined
(if (and load-user-init-file-p init-file-debug)
(progn
;; Do this without a condition-case if the user wants to debug.
(load-user-init-file))
(condition-case error
(progn
(if (and load-user-init-file-p init-file-debug)
(progn
;; Do this without a condition-case if the user wants to debug.
(load-user-init-file))
(condition-case error
(progn
+ ;; #### probably incorrect, see comment above
(if load-user-init-file-p
(load-user-init-file))
(setq init-file-had-error nil))
(if load-user-init-file-p
(load-user-init-file))
(setq init-file-had-error nil))