* startup.el (initial-buffer-choice): Add `none' as a choice

Fixes: debbugs:6234

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be42c4b8b2a3a13efc113ca470b3ba5bdadbc37a..86bc82f3ecdc84e5092b4782577fd71ebdf208a6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * startup.el (initial-buffer-choice): Add `none' as a choice
+       (bug#6234).
+
        * subr.el (add-hook): Clarify section about buffer-local hooks
        (bug#6218).
 

diff --git a/lisp/startup.el b/lisp/startup.el
index c6f3063ca900f31825c433fd24de5e7df7184c71..66deb11623ae2cb4735b62f9a9d48a852829772d 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -41,13 +41,16 @@
 (defcustom initial-buffer-choice nil
   "Buffer to show after starting Emacs.
 If the value is nil and `inhibit-startup-screen' is nil, show the
-startup screen.  If the value is string, visit the specified file or
-directory using `find-file'.  If t, open the `*scratch*' buffer."
+startup screen.  If the value is string, visit the specified file
+or directory using `find-file'.  If t, open the `*scratch*'
+buffer.  If `none', don't select anything, but show the
+buffer (if any) selected by the startup file."
   :type '(choice
          (const     :tag "Startup screen" nil)
          (directory :tag "Directory" :value "~/")
          (file      :tag "File" :value "~/.emacs")
-         (const     :tag "Lisp scratch buffer" t))
+         (const     :tag "Lisp scratch buffer" t)
+         (const     :tag "Select no buffer" 'none))
   :version "23.1"
   :group 'initialization)