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

diff --cc lisp/startup.el
index c1e56fcdff3d956725cce13f2eb266c961766213,63b831ee38d1b6bbfa012ef0a28cca5967f54b02..4eb71abaacf3ddf494de4a9b6837a3df765bfbb5
--- 1/lisp/startup.el
--- 2/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

diff --cc src/editfns.c
Simple merge

diff --cc test/src/editfns-tests.el
Simple merge