summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-08-10 11:37:11 -0700
committerGlenn Morris <rgm@gnu.org>2018-08-10 11:37:11 -0700
commitbd6b6cdb62aac5be34a8bb367f43d8367fc341f8 (patch)
treeb5386b322b0b247ab44eefd12e1fa865844249f7 /lisp/startup.el
parent506ea8a2f70d8c9d53a34ea9469d3edbe6655f0c (diff)
parent71c92d89137b7fdde6c2bd4bed9b8dfda5fa53dd (diff)
downloademacs-bd6b6cdb62aac5be34a8bb367f43d8367fc341f8.tar.gz
Merge from origin/emacs-26
71c92d8 Fix copying text properties by 'format' 96be6b6 Improve error messages regarding initial-buffer-choice (Bug#2... 00fb127 * test/lisp/wdired-tests.el (wdired-test-unfinished-edit-01):... Conflicts: lisp/startup.el
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 c1e56fcdff3..4eb71abaacf 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2534,9 +2534,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 (delq buf displayable-buffers)))))
;; Display the first two buffers in `displayable-buffers'. If