From: Glenn Morris <rgm@gnu.org>
Date: Fri, 10 Aug 2018 18:37:11 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4614
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd6b6cdb62aac5be34a8bb367f43d8367fc341f8;p=emacs.git

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

bd6b6cdb62aac5be34a8bb367f43d8367fc341f8
diff --cc lisp/startup.el
index c1e56fcdff3,63b831ee38d..4eb71abaacf
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@@ -2534,10 -2515,10 +2534,10 @@@ 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))))
 +        (setq displayable-buffers (cons buf (delq buf displayable-buffers)))))
  
      ;; Display the first two buffers in `displayable-buffers'.  If
      ;; `initial-buffer-choice' is non-nil, its buffer will be the