diff options
| author | Alan Third <alan@idiocy.org> | 2018-08-11 14:37:37 +0100 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2018-08-11 14:37:37 +0100 |
| commit | e39f975ee9e0b9f3682ee4b86800821d2e40aaa8 (patch) | |
| tree | 213a0f3172d10f941a03cbea578d6188c8dbd320 /lisp/startup.el | |
| parent | ef1abd99fafc9177058438cdf84776441ce62fc5 (diff) | |
| parent | 914b0300bcca8ac016b85df54ed36c98d07c74a7 (diff) | |
| download | emacs-scratch/ns-drawing.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into ns-drawingscratch/ns-drawing
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 4 |
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 |