commit bash-20080403 snapshot

6 files changed, 35 insertions, 14 deletions

diff --git a/doc/bash.1 b/doc/bash.1
index 0d1e0c67..9ac5b2a4 100644
--- a/doc/bash.1
+++ b/doc/bash.1
@@ -10,7 +10,7 @@
 .\" bash_builtins, strip all but Built-Ins section
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH BASH 1 "2008 March 27" "GNU Bash-3.2"
+.TH BASH 1 "2008 April 5" "GNU Bash-3.2"
 .\"
 .\" There's some problem with having a `@'
 .\" in a tagged paragraph with the BSD man macros.
@@ -4711,6 +4711,10 @@ If set to \fBon\fP, the history code attempts to place point at the
 same location on each history line retrieved with \fBprevious-history\fP
 or \fBnext-history\fP.
 .TP
+.B history\-size (0)
+Set the maximum number of history entries saved in the history list.  If
+set to zero, the number of entries in the history list is not limited.
+.TP
 .B horizontal\-scroll\-mode (Off)
 When set to \fBOn\fP, makes readline use a single line for display,
 scrolling the input horizontally on a single screen line when it
@@ -7515,7 +7519,7 @@ The return status is 0 unless an error occurs while
 reading the name of the current directory or an
 invalid option is supplied.
 .TP
-\fBread\fP [\fB\-ers\fP] [\fB\-a\fP \fIaname\fP] [\fB\-d\fP \fIdelim\fP] [\fB\-n\fP \fInchars\fP] [\fB\-p\fP \fIprompt\fP] [\fB\-t\fP \fItimeout\fP] [\fB\-u\fP \fIfd\fP] [\fIname\fP ...]
+\fBread\fP [\fB\-ers\fP] [\fB\-a\fP \fIaname\fP] [\fB\-d\fP \fIdelim\fP] [\fb\-\fP \fItext\fP] [\fB\-n\fP \fInchars\fP] [\fB\-p\fP \fIprompt\fP] [\fB\-t\fP \fItimeout\fP] [\fB\-u\fP \fIfd\fP] [\fIname\fP ...]
 One line is read from the standard input, or from the file descriptor
 \fIfd\fP supplied as an argument to the \fB\-u\fP option, and the first word
 is assigned to the first
@@ -7559,6 +7563,12 @@ is coming from a terminal,
 .B READLINE
 above) is used to obtain the line.
 .TP
+.B \-i \fItext\fP
+If
+.B readline
+is being used to read the line, \fItext\fP is placed into the editing
+buffer before editing begins.
+.TP
 .B \-n \fInchars\fP
 \fBread\fP returns after reading \fInchars\fP characters rather than
 waiting for a complete line of input.
diff --git a/doc/bash.1~ b/doc/bash.1~
index c6df3dee..8977354e 100644
--- a/doc/bash.1~
+++ b/doc/bash.1~
@@ -10,7 +10,7 @@
 .\" bash_builtins, strip all but Built-Ins section
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH BASH 1 "2008 March 27" "GNU Bash-3.2"
+.TH BASH 1 "2008 April 5" "GNU Bash-3.2"
 .\"
 .\" There's some problem with having a `@'
 .\" in a tagged paragraph with the BSD man macros.
@@ -6497,9 +6497,9 @@ an error occurs adding a completion specification.
 \fBcompopt\fP [\fB\-o\fP \fIoption\fP] [\fB+o\fP \fIoption\fP] [\fIname\fP]
 Modify completion options for each \fIname\fP according to the
 \fIoption\fPs, or for the
-currently-execution completion if no \fIname\fPs are supplied.  If no
-\fIoption\fPs are given, display the completion options for each \fIname\fP
-or the current completion.
+currently-execution completion if no \fIname\fPs are supplied.
+If no \fIoption\fPs are given, display the completion options for each
+\fIname\fP or the current completion.
 The possible values of \fIoption\fP are those valid for the \fBcomplete\fP
 builtin described above.
 .PP
@@ -7515,7 +7515,7 @@ The return status is 0 unless an error occurs while
 reading the name of the current directory or an
 invalid option is supplied.
 .TP
-\fBread\fP [\fB\-ers\fP] [\fB\-a\fP \fIaname\fP] [\fB\-d\fP \fIdelim\fP] [\fB\-n\fP \fInchars\fP] [\fB\-p\fP \fIprompt\fP] [\fB\-t\fP \fItimeout\fP] [\fB\-u\fP \fIfd\fP] [\fIname\fP ...]
+\fBread\fP [\fB\-ers\fP] [\fB\-a\fP \fIaname\fP] [\fB\-d\fP \fIdelim\fP] [\fb\-\fP \fItext\fP] [\fB\-n\fP \fInchars\fP] [\fB\-p\fP \fIprompt\fP] [\fB\-t\fP \fItimeout\fP] [\fB\-u\fP \fIfd\fP] [\fIname\fP ...]
 One line is read from the standard input, or from the file descriptor
 \fIfd\fP supplied as an argument to the \fB\-u\fP option, and the first word
 is assigned to the first
@@ -7559,6 +7559,12 @@ is coming from a terminal,
 .B READLINE
 above) is used to obtain the line.
 .TP
+.B \-i \fItext\fP
+If
+.B readline
+is being used to read the line, \fItext\fP is placed into the editing
+buffer before editing begins.
+.TP
 .B \-n \fInchars\fP
 \fBread\fP returns after reading \fInchars\fP characters rather than
 waiting for a complete line of input.
diff --git a/doc/bashref.texi b/doc/bashref.texi
index a7571020..830599f6 100644
--- a/doc/bashref.texi
+++ b/doc/bashref.texi
@@ -3488,7 +3488,7 @@ non-zero on failure.
 @item read
 @btindex read
 @example
-read [-ers] [-a @var{aname}] [-d @var{delim}] [-n @var{nchars}] [-p @var{prompt}] [-t @var{timeout}] [-u @var{fd}] [@var{name} @dots{}]
+read [-ers] [-a @var{aname}] [-d @var{delim}] [-i @var{text}] [-n @var{nchars}] [-p @var{prompt}] [-t @var{timeout}] [-u @var{fd}] [@var{name} @dots{}]
 @end example
 One line is read from the standard input, or from the file descriptor
 @var{fd} supplied as an argument to the @option{-u} option, and the first word
@@ -3522,6 +3522,10 @@ rather than newline.
 @item -e
 Readline (@pxref{Command Line Editing}) is used to obtain the line.
 
+@item -i @var{text}
+If Readline is being used to read the line, @var{text} is placed into
+the editing buffer before editing begins.
+
 @item -n @var{nchars}
 @code{read} returns after reading @var{nchars} characters rather than
 waiting for a complete line of input.
diff --git a/doc/bashref.texi~ b/doc/bashref.texi~
index e58e6706..a7571020 100644
--- a/doc/bashref.texi~
+++ b/doc/bashref.texi~
@@ -7067,8 +7067,9 @@ the @code{bind} builtin.
 
 @item
 Bash provides a programmable word completion mechanism
-(@pxref{Programmable Completion}), and two builtin commands,
-@code{complete} and @code{compgen}, to manipulate it.
+(@pxref{Programmable Completion}), and builtin commands
+@code{complete}, @code{compgen}, and @code{compopt}, to
+manipulate it.
 
 @item
 Bash has command history (@pxref{Bash History Facilities}) and the
diff --git a/doc/version.texi b/doc/version.texi
index 02791e7e..096faa7a 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -2,9 +2,9 @@
 Copyright (C) 1988-2008 Free Software Foundation, Inc.
 @end ignore
 
-@set LASTCHANGE Thu Mar 27 22:19:20 EDT 2008
+@set LASTCHANGE Sat Apr  5 22:13:08 EDT 2008
 
 @set EDITION 3.2
 @set VERSION 3.2
-@set UPDATED 27 March 2008
-@set UPDATED-MONTH March 2008
+@set UPDATED 5 April 2008
+@set UPDATED-MONTH April 2008
diff --git a/doc/version.texi~ b/doc/version.texi~
index f1722f78..02791e7e 100644
--- a/doc/version.texi~
+++ b/doc/version.texi~
@@ -2,7 +2,7 @@
 Copyright (C) 1988-2008 Free Software Foundation, Inc.
 @end ignore
 
-@set LASTCHANGE Fri Feb 22 21:45:01 EST 2008
+@set LASTCHANGE Thu Mar 27 22:19:20 EDT 2008
 
 @set EDITION 3.2
 @set VERSION 3.2