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 /doc | |
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 'doc')
-rw-r--r-- | doc/emacs/ChangeLog | 3 | ||||
-rw-r--r-- | doc/emacs/entering.texi | 17 | ||||
-rw-r--r-- | doc/emacs/misc.texi | 6 | ||||
-rw-r--r-- | doc/lispref/ChangeLog | 2 | ||||
-rw-r--r-- | doc/lispref/os.texi | 15 |
5 files changed, 29 insertions, 14 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 8f10c90dc0..7c85d3a617 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,8 @@ 2014-06-08 Glenn Morris <[email protected]> + * entering.texi (Entering Emacs): Small fix re initial-buffer-choice. + * misc.texi (emacsclient Options): Copyedit. + * buffers.texi (Uniquify): Copyedits. * files.texi (Visiting): Update for uniquify changes. diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index 71b1fc839a..f8ab4eb971 100644 --- a/doc/emacs/entering.texi +++ b/doc/emacs/entering.texi @@ -76,12 +76,17 @@ information about @file{site-start.el}.} You can also force Emacs to display a file or directory at startup by setting the variable @code{initial-buffer-choice} to a string naming that file or directory. The value of -@code{initial-buffer-choice} may also be a function which should -return a buffer which is then displayed. @code{initial-buffer-choice} -may also be @code{t} in which case the @file{*scratch*} buffer will be -shown. In any case, even if you specify one or more files on the -command line, Emacs opens but does not display them if -@code{initial-buffer-choice} is non-nil. +@code{initial-buffer-choice} may also be a function (of no arguments) +that should return a buffer which is then displayed. +@ignore +@c I do not think this should be mentioned. AFAICS it is just a dodge +@c around inhibit-startup-screen not being settable on a site-wide basis. +@code{initial-buffer-choice} may also be @code{t} in which case the +@file{*scratch*} buffer will be shown. +@end ignore +If @code{initial-buffer-choice} is non-@code{nil}, then if you specify +any files on the command line, Emacs still visits them, but does not +display them initially. @node Exiting @section Exiting Emacs diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 99bae873c2..f09f23e6a4 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1560,9 +1560,9 @@ option, like the @samp{-t} option, creates a new frame in the server's current text terminal. @xref{Windows Startup}. If you omit a filename argument while supplying the @samp{-c} option, -the new frame displays the @file{*scratch*} buffer by default. This -behavior can be customized using the variable -@code{initial-buffer-choice} (@pxref{Entering Emacs}). +the new frame displays the @file{*scratch*} buffer by default. You +can customize this behavior with the variable @code{initial-buffer-choice} +(@pxref{Entering Emacs}). @item -F @var{alist} @itemx --frame-parameters=@var{alist} diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index aa5589e1c1..2b00d9743b 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2014-06-08 Glenn Morris <[email protected]> + * os.texi (Startup Summary): Small fix for initial-buffer-choice. + * files.texi (Subroutines of Visiting): Mention uniquify. * numbers.texi (Comparison of Numbers): Copyedits. diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 272a356c7f..59ad376436 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -194,11 +194,16 @@ It processes any command-line options that were not handled earlier. It now exits if the option @code{--batch} was specified. @item -If @code{initial-buffer-choice} is a string, it visits the file with -that name. If it is a function, it calls the function and selects the -buffer returned by the function. It it is @code{t}, it selects the -@file{*scratch*} buffer. If the @file{*scratch*} buffer exists and is -empty, it inserts @code{initial-scratch-message} into that buffer. +If @code{initial-buffer-choice} is a string, it visits the file (or +directory) with that name. If it is a function, it calls the function +with no arguments and selects the buffer that it returns. +@ignore +@c I do not think this should be mentioned. AFAICS it is just a dodge +@c around inhibit-startup-screen not being settable on a site-wide basis. +If it is @code{t}, it selects the @file{*scratch*} buffer. +@end ignore +If the @file{*scratch*} buffer exists and is empty, it inserts +@code{initial-scratch-message} into that buffer. @c To make things nice and confusing, the next three items can be @c called from two places. If displaying a startup screen, they are |