From: Alexander Gramiak <agrambot@gmail.com>
Date: Wed, 1 Nov 2017 03:10:52 +0000 (-0600)
Subject: Improve error messages regarding initial-buffer-choice (Bug#29098)
X-Git-Tag: emacs-26.1.90~213
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=96be6b6;p=emacs.git

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.
---

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