[Emacs-diffs] trunk r115634: Document `initial-buffer-choice' changes.

[Tassilo Horn]

------------------------------------------------------------
revno: 115634
revision-id: address@hidden
parent: address@hidden
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-20 15:18:21 +0100
message:
  Document `initial-buffer-choice' changes.
  
  * doc/emacs/entering.texi: Document `initial-buffer-choice' changes.
  
  * doc/emacs/misc.texi (arguments): Document `initial-buffer-choice' changes.
  
  * doc/lispref/os.texi: Document `initial-buffer-choice' changes.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/entering.texi        
entering.texi-20091113204419-o5vbwnq5f7feedwu-6248
  doc/emacs/misc.texi            misc.texi-20091113204419-o5vbwnq5f7feedwu-6267
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/os.texi            os.texi-20091113204419-o5vbwnq5f7feedwu-6205
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-12-20 13:55:44 +0000
+++ b/doc/emacs/ChangeLog       2013-12-20 14:18:21 +0000
@@ -1,5 +1,9 @@
 2013-12-20  Tassilo Horn  <address@hidden>
 
+       * entering.texi: Document `initial-buffer-choice' changes.
+
+       * misc.texi (arguments): Document `initial-buffer-choice' changes.
+
        * help.texi: Document that `?' now also shows subcommands of
        prefix keys.
 

=== modified file 'doc/emacs/entering.texi'
--- a/doc/emacs/entering.texi   2013-01-01 09:11:05 +0000
+++ b/doc/emacs/entering.texi   2013-12-20 14:18:21 +0000
@@ -74,11 +74,14 @@
 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
address@hidden value.  (In that case, even if you specify one or more
-files on the command line, Emacs opens but does not display them.)
-The value of @code{initial-buffer-choice} should be the name of
-the desired file or directory.
+by setting the variable @code{initial-buffer-choice} to a a string
+naming that file or directory.  The value of
address@hidden 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
address@hidden is non-nil.
 
 @node Exiting
 @section Exiting Emacs

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2013-01-02 16:13:04 +0000
+++ b/doc/emacs/misc.texi       2013-12-20 14:18:21 +0000
@@ -1542,9 +1542,9 @@
 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.  If
address@hidden is a string (@pxref{Entering Emacs}), the
-new frame displays that file or directory instead.
+the new frame displays the @file{*scratch*} buffer by default.  This
+behavior can be customized using the variable
address@hidden (@pxref{Entering Emacs}).
 
 @item -F @var{alist}
 @itemx address@hidden

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-12-20 07:12:04 +0000
+++ b/doc/lispref/ChangeLog     2013-12-20 14:18:21 +0000
@@ -1,3 +1,7 @@
+2013-12-20  Tassilo Horn  <address@hidden>
+
+       * os.texi: Document `initial-buffer-choice' changes.
+
 2013-12-20  Chong Yidong  <address@hidden>
 
        * text.texi (Changing Properties): Improve documentation for

=== modified file 'doc/lispref/os.texi'
--- a/doc/lispref/os.texi       2013-11-27 06:15:06 +0000
+++ b/doc/lispref/os.texi       2013-12-20 14:18:21 +0000
@@ -195,7 +195,9 @@
 
 @item
 If @code{initial-buffer-choice} is a string, it visits the file with
-that name.  If the @file{*scratch*} buffer exists and is
+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
address@hidden buffer.  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
@@ -271,11 +273,9 @@
 If address@hidden, this variable is a string that specifies a file or
 directory for Emacs to display after starting up, instead of the
 startup screen.
address@hidden
address@hidden I do not think this should be mentioned.  AFAICS it is just a 
dodge
address@hidden around inhibit-startup-screen not being settable on a site-wide 
basis.
+If its value is a function, Emacs calls that function which must
+return a buffer which is then displayed.
 If its value is @code{t}, Emacs displays the @file{*scratch*} buffer.
address@hidden ignore
 @end defopt
 
 @defopt inhibit-startup-echo-area-message

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-12-20 14:00:21 +0000
+++ b/etc/NEWS  2013-12-20 14:18:21 +0000
@@ -135,6 +135,7 @@
 This unfinished feature was introduced by accident in Emacs 23.1;
 simply disabling Transient Mark mode does the same thing.
 
++++
 ** `initial-buffer-choice' can now specify a function to set up the
 initial buffer.