aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1994-04-16 03:43:09 +0000
committerKarl Heuer1994-04-16 03:43:09 +0000
commitad2aeb8d88f3a94dfad2a0fab826252f87cee035 (patch)
treee9636ba3fe56f5898f1c9dac1a9d43f65f028d54
parentd90216747705a08fbf8407eac95143c0265e0514 (diff)
downloademacs-ad2aeb8d88f3a94dfad2a0fab826252f87cee035.tar.gz
emacs-ad2aeb8d88f3a94dfad2a0fab826252f87cee035.zip
(command-line): If no error data, print "", not nil.
-rw-r--r--lisp/startup.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 36a7ee9c1ee..8ef326bb2ad 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -295,10 +295,10 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.")
295 (setq init-file-had-error nil)) 295 (setq init-file-had-error nil))
296 (error (message "Error in init file: %s%s%s" 296 (error (message "Error in init file: %s%s%s"
297 (get (car error) 'error-message) 297 (get (car error) 'error-message)
298 (if (cdr error) ": ") 298 (if (cdr error) ": " "")
299 (mapconcat 'prin1-to-string (cdr error) ", ")) 299 (mapconcat 'prin1-to-string (cdr error) ", "))
300 (setq init-file-had-error t)))) 300 (setq init-file-had-error t))))
301 ;; If we can tell that the init file altered debug-on-error., 301 ;; If we can tell that the init file altered debug-on-error,
302 ;; arrange to preserve the value that it set up. 302 ;; arrange to preserve the value that it set up.
303 (or (eq debug-on-error debug-on-error-initial) 303 (or (eq debug-on-error debug-on-error-initial)
304 (setq debug-on-error-should-be-set t 304 (setq debug-on-error-should-be-set t