[Emacs-diffs] emacs-24 r117228: Small doc updates re initial-buffer-choice

[Glenn Morris]

------------------------------------------------------------
revno: 117228
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-06-08 10:46:51 -0700
message:
  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).
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
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/startup.el                startup.el-20091113204419-o5vbwnq5f7feedwu-260

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-06-08 07:41:27 +0000
+++ b/doc/emacs/ChangeLog       2014-06-08 17:46:51 +0000
@@ -1,5 +1,8 @@
 2014-06-08  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'doc/emacs/entering.texi'
--- a/doc/emacs/entering.texi   2014-01-01 07:43:34 +0000
+++ b/doc/emacs/entering.texi   2014-06-08 17:46:51 +0000
@@ -76,12 +76,17 @@
   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
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.
address@hidden may also be a function (of no arguments)
+that should return a buffer which is then displayed.
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.
address@hidden may also be @code{t} in which case the
address@hidden buffer will be shown.
address@hidden ignore
+If @code{initial-buffer-choice} is address@hidden, 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

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2014-06-02 01:14:08 +0000
+++ b/doc/emacs/misc.texi       2014-06-08 17:46:51 +0000
@@ -1560,9 +1560,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.  This
-behavior can be customized using the variable
address@hidden (@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 address@hidden

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2014-06-08 07:41:27 +0000
+++ b/doc/lispref/ChangeLog     2014-06-08 17:46:51 +0000
@@ -1,5 +1,7 @@
 2014-06-08  Glenn Morris  <address@hidden>
 
+       * os.texi (Startup Summary): Small fix for initial-buffer-choice.
+
        * files.texi (Subroutines of Visiting): Mention uniquify.
 
        * numbers.texi (Comparison of Numbers): Copyedits.

=== modified file 'doc/lispref/os.texi'
--- a/doc/lispref/os.texi       2014-06-06 07:19:23 +0000
+++ b/doc/lispref/os.texi       2014-06-08 17:46:51 +0000
@@ -194,11 +194,16 @@
 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
address@hidden 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.
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 it is @code{t}, it selects the @file{*scratch*} buffer.
address@hidden ignore
+If the @file{*scratch*} buffer exists and is empty, it inserts
address@hidden 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-08 07:41:27 +0000
+++ b/lisp/ChangeLog    2014-06-08 17:46:51 +0000
@@ -1,5 +1,8 @@
 2014-06-08  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2014-06-06 07:19:23 +0000
+++ b/lisp/startup.el   2014-06-08 17:46:51 +0000
@@ -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