summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorAlexander Gramiak <agrambot@gmail.com>2017-10-31 21:10:52 -0600
committerNoam Postavsky <npostavs@gmail.com>2018-08-09 08:12:07 -0400
commit96be6b6eb99ae1d77702932c97e8b3a147c6265a (patch)
treed5d5bc19838fb4902b803a0a4f91b055d0a6923f /lisp/startup.el
parent00fb12703142938e7dfcfb0b3373a38f1dddecc0 (diff)
downloademacs-96be6b6eb99ae1d77702932c97e8b3a147c6265a.tar.gz
Improve error messages regarding initial-buffer-choice (Bug#29098)
* lisp/startup.el (command-line-1) <initial-buffer-choice>: Make the messages conform to Emacs conventions, and show the invalid return value in the message.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 33f8ca63f8d..63b831ee38d 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2515,9 +2515,9 @@ nil default-directory" name)
((eq initial-buffer-choice t)
(get-buffer-create "*scratch*"))
(t
- (error "initial-buffer-choice must be a string, a function, or t.")))))
+ (error "`initial-buffer-choice' must be a string, a function, or t")))))
(unless (buffer-live-p buf)
- (error "initial-buffer-choice is not a live buffer."))
+ (error "Value returned by `initial-buffer-choice' is not a live buffer: %S" buf))
(setq displayable-buffers (cons buf displayable-buffers))))
;; Display the first two buffers in `displayable-buffers'. If