Commit 52320897 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(command-line): Set init-file-had-error to t or nil.

(command-line-1): Inhibit startup message if init-file-had-error.
parent 9de0760c
......@@ -129,6 +129,8 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.")
(defvar init-file-debug nil)
(defvar init-file-had-error nil)
(defun normal-top-level ()
(if command-line-processed
(message "Back to top level.")
......@@ -271,11 +273,14 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.")
;; Do this without a condition-case if the user wants to debug.
(funcall inner)
(condition-case error
(funcall inner)
(progn
(funcall inner)
(setq init-file-had-error nil))
(error (message "Error in init file: %s%s%s"
(get (car error) 'error-message)
(if (cdr error) ": ")
(mapconcat 'prin1-to-string (cdr error) ", "))))))
(mapconcat 'prin1-to-string (cdr error) ", "))
(setq init-file-had-error t)))))
(run-hooks 'after-init-hook)
......@@ -304,7 +309,7 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.")
(if noninteractive (kill-emacs t)))
(defun command-line-1 (command-line-args-left)
(or noninteractive (input-pending-p)
(or noninteractive (input-pending-p) init-file-had-error
(message (if (eq (key-binding "\C-h\C-p") 'describe-project)
"For information about the GNU Project and its goals, type C-h C-p."
(substitute-command-keys
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment