From: Lars Magne Ingebrigtsen Date: Thu, 14 Jul 2011 12:57:06 +0000 (+0200) Subject: (initial-buffer-choice): Don't mention the `none' selection, which is against policy. X-Git-Tag: emacs-pretest-24.0.90~104^2~290 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=621ef9abdb9106216353dae75a46fe64f8587406;p=emacs.git (initial-buffer-choice): Don't mention the `none' selection, which is against policy. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9814cae16bb..3cc219a01d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-07-14 Lars Magne Ingebrigtsen + + * startup.el (initial-buffer-choice): Don't mention the `none' + selection, which is against policy. + 2011-07-14 Martin Rudalics * window.el (display-buffer-normalize-special): Replace diff --git a/lisp/startup.el b/lisp/startup.el index 66deb11623a..6953ed25ed4 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -43,14 +43,12 @@ 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. If `none', don't select anything, but show the -buffer (if any) selected by the startup file." +buffer." :type '(choice (const :tag "Startup screen" nil) (directory :tag "Directory" :value "~/") (file :tag "File" :value "~/.emacs") - (const :tag "Lisp scratch buffer" t) - (const :tag "Select no buffer" 'none)) + (const :tag "Lisp scratch buffer" t)) :version "23.1" :group 'initialization)