diff options
| author | Glenn Morris <[email protected]> | 2014-06-08 10:46:51 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2014-06-08 10:46:51 -0700 |
| commit | 6d069b1b3ab171c86deed9c19ef9736d32d8fc43 (patch) | |
| tree | 1693284bbc7abde24ce692e123c5e5802fbb63a2 /lisp | |
| parent | 99d8aedf0d6ab3fff025f72daf1f9bd28b07a8d2 (diff) | |
Small doc updates re initial-buffer-choice
* doc/emacs/entering.texi (Entering Emacs): Small fix re initial-buffer-choice.
* doc/emacs/misc.texi (emacsclient Options): Copyedit.
* doc/lispref/os.texi (Startup Summary): Small fix for initial-buffer-choice.
* lisp/startup.el (initial-buffer-choice): Doc fix.
Reset :version (adding an option does not merit a :version bump).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/startup.el | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 66afe67a61..ca2781b40f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-06-08 Glenn Morris <[email protected]> + * startup.el (initial-buffer-choice): Doc fix. + Reset :version (adding an option does not merit a :version bump). + * bookmark.el (bookmark-load): * uniquify.el (uniquify-buffer-name-style): Doc fixes. diff --git a/lisp/startup.el b/lisp/startup.el index 5f1bdeadbd..2f1d9af1cf 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -42,20 +42,21 @@ "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 a string, switch to a buffer -visiting the file or directory specified by that string. If the -value is a function, switch to the buffer returned by that -function. If t, open the `*scratch*' buffer. +visiting the file or directory that the string specifies. If the +value is a function, call it with no arguments and switch to the buffer +that it returns. If t, open the `*scratch*' buffer. -A string value also causes emacsclient to open the specified file -or directory when no target file is specified." +If you use `emacsclient' with no target file, then it obeys any +string or function value that this variable has." :type '(choice (const :tag "Startup screen" nil) (directory :tag "Directory" :value "~/") (file :tag "File" :value "~/.emacs") - (const :tag "Notes buffer" remember-notes) + ;; Note sure about hard-coding this as an option... + (const :tag "Remember Mode notes buffer" remember-notes) (function :tag "Function") (const :tag "Lisp scratch buffer" t)) - :version "24.4" + :version "23.1" :group 'initialization) (defcustom inhibit-startup-screen nil |