Merge changes from emacs-24 branch

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 4a8af55af2f693ceea4520f7a66fce9e49aef266..d6e730236996eacb649384ea9785c1cb1ea8a10b 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -41,7 +41,7 @@
 (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
+startup screen.  If the value is a string, visit the specified file
 or directory using `find-file'.  If t, open the `*scratch*'
 buffer."
   :type '(choice