summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-13 23:53:41 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-13 23:53:41 +0200
commit0f04b32ce1d0f6f6e94b77931122acf3da3b3680 (patch)
treee3db753b03d6f940275e8f489e23c30b1acbdbe4
parent63d55f1f91e7ed9bc9a190a9861103b955ef6381 (diff)
downloademacs-0f04b32ce1d0f6f6e94b77931122acf3da3b3680.tar.gz
* startup.el (initial-buffer-choice): Add `none' as a choice
Fixes: debbugs:6234
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/startup.el9
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be42c4b8b2a..86bc82f3ecd 100644
--- 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 c6f3063ca90..66deb11623a 100644
--- 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)