Revert "Sync readline/ to version 7.0 alpha"

[deliverable/binutils-gdb.git] / readline / doc / hsuser.texi

diff --git a/readline/doc/hsuser.texi b/readline/doc/hsuser.texi
index 3aa6cfa2453384b7a888355664d40532c6dd9fed..9aa6c358dbe4e023fde5557c0391a420e298d3a7 100644 (file)
--- a/readline/doc/hsuser.texi
+++ b/readline/doc/hsuser.texi
@@ -1,7 +1,7 @@
 @ignore
 This file documents the user interface to the GNU History library.
 
 @ignore
 This file documents the user interface to the GNU History library.
 

-Copyright (C) 1988--2014 Free Software Foundation, Inc.
+Copyright (C) 1988--2011 Free Software Foundation, Inc.

 Authored by Brian Fox and Chet Ramey.
 
 Permission is granted to make and distribute verbatim copies of this manual
 Authored by Brian Fox and Chet Ramey.
 
 Permission is granted to make and distribute verbatim copies of this manual


@@ -26,9 +26,10 @@ into another language, under the above conditions for modified versions.
 @node Using History Interactively
 @chapter Using History Interactively
 
 @node Using History Interactively
 @chapter Using History Interactively
 

-@ifclear BashFeatures
-@defcodeindex bt
-@end ifclear
+@c GDB bundling modification:
+@c @ifclear BashFeatures
+@c @defcodeindex bt
+@c @end ifclear

 
 @ifset BashFeatures
 This chapter describes how to use the @sc{gnu} History Library
 
 @ifset BashFeatures
 This chapter describes how to use the @sc{gnu} History Library


@@ -41,7 +42,8 @@ see the @sc{gnu} Readline Library Manual.
 This chapter describes how to use the @sc{gnu} History Library interactively,
 from a user's standpoint.  It should be considered a user's guide.  For
 information on using the @sc{gnu} History Library in your own programs,
 This chapter describes how to use the @sc{gnu} History Library interactively,
 from a user's standpoint.  It should be considered a user's guide.  For
 information on using the @sc{gnu} History Library in your own programs,

-@pxref{Programming with GNU History}.
+@c GDB bundling modification:
+@pxref{Programming with GNU History, , , history, GNU History Library}.

 @end ifclear
 
 @ifset BashFeatures
 @end ifclear
 
 @ifset BashFeatures


@@ -84,18 +86,17 @@ file named by the @env{HISTFILE} variable (default @file{~/.bash_history}).
 The file named by the value of @env{HISTFILE} is truncated, if
 necessary, to contain no more than the number of lines specified by
 the value of the @env{HISTFILESIZE} variable.
 The file named by the value of @env{HISTFILE} is truncated, if
 necessary, to contain no more than the number of lines specified by
 the value of the @env{HISTFILESIZE} variable.

-When a shell with history enabled exits, the last
+When an interactive shell exits, the last

 @env{$HISTSIZE} lines are copied from the history list to the file
 named by @env{$HISTFILE}.
 If the @code{histappend} shell option is set (@pxref{Bash Builtins}),
 the lines are appended to the history file,
 otherwise the history file is overwritten.
 If @env{HISTFILE}
 @env{$HISTSIZE} lines are copied from the history list to the file
 named by @env{$HISTFILE}.
 If the @code{histappend} shell option is set (@pxref{Bash Builtins}),
 the lines are appended to the history file,
 otherwise the history file is overwritten.
 If @env{HISTFILE}

-is unset, or if the history file is unwritable, the history is not saved.
-After saving the history, the history file is truncated
-to contain no more than @env{$HISTFILESIZE} lines.
-If @env{HISTFILESIZE} is unset, or set to null, a non-numeric value, or
-a numeric value less than zero, the history file is not truncated.
+is unset, or if the history file is unwritable, the history is
+not saved.  After saving the history, the history file is truncated
+to contain no more than @env{$HISTFILESIZE}
+lines.  If @env{HISTFILESIZE} is not set, no truncation is performed.

 
 If the @env{HISTTIMEFORMAT} is set, the time stamp information
 associated with each history entry is written to the history file,
 
 If the @env{HISTTIMEFORMAT} is set, the time stamp information
 associated with each history entry is written to the history file,


@@ -142,10 +143,8 @@ history list and history file.
 @code{fc -s [@var{pat}=@var{rep}] [@var{command}]}
 @end example
 
 @code{fc -s [@var{pat}=@var{rep}] [@var{command}]}
 @end example
 

-The first form selects a range of commands from @var{first} to
-@var{last} from the history list and displays or edits and re-executes
-them.
-Both @var{first} and
+Fix Command.  In the first form, a range of commands from @var{first} to
+@var{last} is selected from the history list.  Both @var{first} and

 @var{last} may be specified as a string (to locate the most recent
 command beginning with that string) or as a number (an index into the
 history list, where a negative number is used as an offset from the
 @var{last} may be specified as a string (to locate the most recent
 command beginning with that string) or as a number (an index into the
 history list, where a negative number is used as an offset from the


@@ -164,7 +163,6 @@ When editing is complete, the edited commands are echoed and executed.
 
 In the second form, @var{command} is re-executed after each instance
 of @var{pat} in the selected command is replaced by @var{rep}.
 
 In the second form, @var{command} is re-executed after each instance
 of @var{pat} in the selected command is replaced by @var{rep}.

-@var{command} is intepreted the same as @var{first} above.

 
 A useful alias to use with the @code{fc} command is @code{r='fc -s'}, so
 that typing @samp{r cc} runs the last command beginning with @code{cc}
 
 A useful alias to use with the @code{fc} command is @code{r='fc -s'}, so
 that typing @samp{r cc} runs the last command beginning with @code{cc}


@@ -202,9 +200,9 @@ Delete the history entry at position @var{offset}.
 displayed.
 
 @item -a
 displayed.
 
 @item -a

-Append the new history lines to the history file.
-These are history lines entered since the beginning of the current
-Bash session, but not already appended to the history file.
+Append the new
+history lines (history lines entered since the beginning of the
+current Bash session) to the history file.

 
 @item -n
 Append the history lines not already read from the history file
 
 @item -n
 Append the history lines not already read from the history file


@@ -212,11 +210,11 @@ to the current history list.  These are lines appended to the history
 file since the beginning of the current Bash session.
 
 @item -r
 file since the beginning of the current Bash session.
 
 @item -r

-Read the history file and append its contents to
+Read the current history file and append its contents to

 the history list.
 
 @item -w
 the history list.
 
 @item -w

-Write out the current history list to the history file.
+Write out the current history to the history file.

 
 @item -p
 Perform history substitution on the @var{arg}s and display the result
 
 @item -p
 Perform history substitution on the @var{arg}s and display the result