[Emacs-diffs] /srv/bzr/emacs/trunk r105178: * startup.el (initial-buffer-choice): Add `none' as a choice

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105178
fixes bug(s): http://debbugs.gnu.org/6234
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 23:53:41 +0200
message:
  * startup.el (initial-buffer-choice): Add `none' as a choice
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-13 21:38:56 +0000
+++ b/lisp/ChangeLog    2011-07-13 21:53:41 +0000
@@ -1,5 +1,8 @@
 2011-07-13  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * startup.el (initial-buffer-choice): Add `none' as a choice
+       (bug#6234).
+
        * subr.el (add-hook): Clarify section about buffer-local hooks
        (bug#6218).
 

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2011-07-10 02:06:09 +0000
+++ b/lisp/startup.el   2011-07-13 21:53:41 +0000
@@ -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)