[Emacs-diffs] emacs/doc/emacs ChangeLog building.texi enterin...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/22 01:29:26

Modified files:
        doc/emacs      : ChangeLog building.texi entering.texi 

Log message:
        * entering.texi (Entering Emacs): Document initial-buffer-choice.
        * building.texi (Lisp Interaction): Document initial-scratch-message.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/ChangeLog?cvsroot=emacs&r1=1.309&r2=1.310
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/building.texi?cvsroot=emacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/entering.texi?cvsroot=emacs&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/ChangeLog,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -b -r1.309 -r1.310
--- ChangeLog   18 Apr 2009 12:40:46 -0000      1.309
+++ ChangeLog   22 Apr 2009 01:29:25 -0000      1.310
@@ -1,3 +1,9 @@
+2009-04-22  Chong Yidong  <address@hidden>
+
+       * entering.texi (Entering Emacs): Document initial-buffer-choice.
+
+       * building.texi (Lisp Interaction): Document initial-scratch-message.
+
 2009-04-18  Juanma Barranquero  <address@hidden>
 
        * msdog.texi (Windows Fonts): Fix typos.

Index: building.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/building.texi,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- building.texi       25 Jan 2009 00:56:54 -0000      1.17
+++ building.texi       22 Apr 2009 01:29:25 -0000      1.18
@@ -1404,6 +1404,13 @@
 before point.  The result is a complete typescript of the expressions
 you have evaluated and their values.
 
address@hidden initial-scratch-message
+  At startup, the @samp{*scratch*} buffer contains a short message, in
+the form of a Lisp comment, that explains what it is for.  This
+message is controlled by the variable @code{initial-scratch-message},
+which should be either a string or @code{nil}.  If you set it to the
+empty string, or @code{nil}, the initial message is suppressed.
+
 @findex lisp-interaction-mode
   All other commands in Lisp Interaction mode are the same as in Emacs
 Lisp mode.  You can enable Lisp Interaction mode by typing @kbd{M-x

Index: entering.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/entering.texi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- entering.texi       8 Jan 2009 05:28:48 -0000       1.10
+++ entering.texi       22 Apr 2009 01:29:25 -0000      1.11
@@ -64,13 +64,13 @@
 features exist mainly for advanced users.  @xref{Emacs Invocation}.
 
 @vindex inhibit-startup-screen
-  If the value of the variable @code{inhibit-startup-screen} is
address@hidden, Emacs does not display the startup screen.  In that
-case, if one or more files were specified on the command line, Emacs
-simply displays those files; otherwise, it displays a buffer named
address@hidden, which can be used to evaluate Emacs Lisp expressions
-interactively (@pxref{Lisp Interaction}).  You can set the variable
address@hidden by using the Customize facility
+  If the variable @code{inhibit-startup-screen} is address@hidden,
+Emacs does not display the startup screen.  In that case, if one or
+more files were specified on the command line, Emacs simply displays
+those files; otherwise, it displays a buffer named @samp{*scratch*},
+which can be used to evaluate Emacs Lisp expressions interactively.
address@hidden Interaction}.  You can set the variable
address@hidden using the Customize facility
 (@pxref{Easy Customization}), or by editing your initialization file
 (@pxref{Init File})address@hidden that setting
 @code{inhibit-startup-screen} in @file{site-start.el} doesn't work,
@@ -78,6 +78,14 @@
 @file{site-start.el}.  @xref{Init File}, for 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} can be either the name of
+the desired file or directory, or @code{t}, which means to display the
address@hidden buffer.
+
 @node Exiting, Basic, Entering Emacs, Top
 @section Exiting Emacs
 @cindex exiting