From a57c6640e843cdfd653c23d1b6f1c77856b81f14 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Fri, 17 Jul 2020 15:14:39 -0400 Subject: [PATCH] commit bash-20200714 snapshot --- CWRU/CWRU.chlog | 7 +++++++ doc/bash.1 | 10 +++++----- doc/bashref.texi | 2 +- execute_cmd.c | 2 ++ lib/readline/doc/history.3 | 8 ++++---- lib/readline/doc/hstech.texi | 4 ++-- lib/readline/doc/readline.3 | 9 +++++---- lib/readline/doc/rluser.texi | 10 +++++----- lib/readline/doc/version.texi | 6 +++--- 9 files changed, 34 insertions(+), 24 deletions(-) diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog index c89fb94e..d0a8e346 100644 --- a/CWRU/CWRU.chlog +++ b/CWRU/CWRU.chlog @@ -8719,3 +8719,10 @@ execute_cmd.c handled before this runs. Fixes complaint about `command' in the background running an extra bash process from Dmitry Alexandrov + + 7/17 + ---- +doc/bash.1 +lib/readline/doc/{rltech,hstech,rluser}.texi +lib/readline/doc/{readline,history}.3 + - a few small tweaks to make the language gender-neutral diff --git a/doc/bash.1 b/doc/bash.1 index f998918a..74617248 100644 --- a/doc/bash.1 +++ b/doc/bash.1 @@ -5795,11 +5795,11 @@ replaced with an ellipsis when displaying possible completions. This determines when the user is queried about viewing the number of possible completions generated by the \fBpossible\-completions\fP command. -It may be set to any integer value greater than or equal to -zero. If the number of possible completions is greater than -or equal to the value of this variable, the user is asked whether -or not he wishes to view them; otherwise they are simply listed -on the terminal. +It may be set to any integer value greater than or equal to zero. +If the number of possible completions is greater than +or equal to the value of this variable, +readline will ask whether or not the user wishes to view them; +otherwise they are simply listed on the terminal. .TP .B convert\-meta (On) If set to \fBOn\fP, readline will convert characters with the diff --git a/doc/bashref.texi b/doc/bashref.texi index e80044f9..ce7a5e83 100644 --- a/doc/bashref.texi +++ b/doc/bashref.texi @@ -2727,7 +2727,7 @@ by @{@var{varname}@}, the value of @var{varname} defines the file descriptor to close. If @{@var{varname}@} is supplied, the redirection persists beyond the scope of the command, allowing the shell programmer to manage -the file descriptor himself. +the file descriptor's lifetime manually. In the following descriptions, if the file descriptor number is omitted, and the first character of the redirection operator is diff --git a/execute_cmd.c b/execute_cmd.c index 831516d2..7cb75f88 100644 --- a/execute_cmd.c +++ b/execute_cmd.c @@ -4446,6 +4446,8 @@ execute_simple_command (simple_command, pipe_in, pipe_out, async, fds_to_close) } tempenv_assign_error = 0; /* don't care about this any more */ + /* This is where we handle the command builtin as a pseudo-reserved word + prefix. This allows us to optimize away forks if we can. */ old_command_builtin = -1; if (builtin == 0 && func == 0) { diff --git a/lib/readline/doc/history.3 b/lib/readline/doc/history.3 index 35b45e63..9b787c6d 100644 --- a/lib/readline/doc/history.3 +++ b/lib/readline/doc/history.3 @@ -6,9 +6,9 @@ .\" Case Western Reserve University .\" chet.ramey@case.edu .\" -.\" Last Change: Fri Nov 15 09:39:27 EST 2019 +.\" Last Change: Fri Jul 17 09:43:01 EDT 2020 .\" -.TH HISTORY 3 "2019 November 15" "GNU History 8.0" +.TH HISTORY 3 "2020 July 17" "GNU History 8.1" .\" .\" File Name macro. This used to be `.PN', for Path Name, .\" but Sun doesn't seem to like that very much. @@ -276,7 +276,7 @@ in the event line. .SH "PROGRAMMING WITH HISTORY FUNCTIONS" This section describes how to use the History library in other programs. .SS Introduction to History -The programmer using the History library has available functions +A programmer using the History library has available functions for remembering lines on a history list, associating arbitrary data with a line, removing lines from the list, searching through the list for a line containing an arbitrary text string, and referencing any line @@ -291,7 +291,7 @@ in new commands. The basic history manipulation commands are identical to the history substitution provided by \fBbash\fP. .PP -If the programmer desires, he can use the Readline library, which +The programmer can also use the Readline library, which includes some history manipulation by default, and has the added advantage of command line editing. .PP diff --git a/lib/readline/doc/hstech.texi b/lib/readline/doc/hstech.texi index dbc21c14..2de62f76 100644 --- a/lib/readline/doc/hstech.texi +++ b/lib/readline/doc/hstech.texi @@ -48,7 +48,7 @@ History library is able to keep track of those lines, associate arbitrary data with each line, and utilize information from previous lines in composing new ones. -The programmer using the History library has available functions +A programmer using the History library has available functions for remembering lines on a history list, associating arbitrary data with a line, removing lines from the list, searching through the list for a line containing an arbitrary text string, and referencing any line @@ -62,7 +62,7 @@ commands for manipulating the text of previous lines and using that text in new commands. The basic history manipulation commands are similar to the history substitution provided by @code{csh}. -If the programmer desires, he can use the Readline library, which +The programmer can also use the Readline library, which includes some history manipulation by default, and has the added advantage of command line editing. diff --git a/lib/readline/doc/readline.3 b/lib/readline/doc/readline.3 index d7ddf6d3..0663556e 100644 --- a/lib/readline/doc/readline.3 +++ b/lib/readline/doc/readline.3 @@ -403,10 +403,11 @@ replaced with an ellipsis when displaying possible completions. This determines when the user is queried about viewing the number of possible completions generated by the \fBpossible\-completions\fP command. -It may be set to any integer value greater than or equal to -zero. If the number of possible completions is greater than -or equal to the value of this variable, the user is asked whether -or not he wishes to view them; otherwise they are simply listed +It may be set to any integer value greater than or equal to zero. +If the number of possible completions is greater than +or equal to the value of this variable, +readline will ask whether or not the user wishes to view them; +otherwise they are simply listed on the terminal. A negative value causes readline to never ask. .TP .B convert\-meta (On) diff --git a/lib/readline/doc/rluser.texi b/lib/readline/doc/rluser.texi index e22f28c1..ff5059e1 100644 --- a/lib/readline/doc/rluser.texi +++ b/lib/readline/doc/rluser.texi @@ -493,9 +493,9 @@ replaced with an ellipsis when displaying possible completions. @vindex completion-query-items The number of possible completions that determines when the user is asked whether the list of possibilities should be displayed. -If the number of possible completions is greater than this value, -Readline will ask the user whether or not he wishes to view -them; otherwise, they are simply listed. +If the number of possible completions is greater than or equal to this value, +Readline will ask whether or not the user wishes to view them; +otherwise, they are simply listed. This variable must be set to an integer value greater than or equal to 0. A negative value means Readline should never ask. The default limit is @code{100}. @@ -1115,8 +1115,8 @@ set convert-meta off # rather than as meta-prefixed characters set output-meta on -# if there are more than 150 possible completions for -# a word, ask the user if he wants to see all of them +# if there are 150 or more possible completions for a word, +# ask whether or not the user wants to see all of them set completion-query-items 150 # For FTP diff --git a/lib/readline/doc/version.texi b/lib/readline/doc/version.texi index 74368d2f..cb495abf 100644 --- a/lib/readline/doc/version.texi +++ b/lib/readline/doc/version.texi @@ -4,7 +4,7 @@ Copyright (C) 1988-2020 Free Software Foundation, Inc. @set EDITION 8.1 @set VERSION 8.1 -@set UPDATED 18 June 2020 -@set UPDATED-MONTH June 2020 +@set UPDATED 17 July 2020 +@set UPDATED-MONTH July 2020 -@set LASTCHANGE Thu Jun 18 11:25:17 EDT 2020 +@set LASTCHANGE Fri Jul 17 09:35:36 EDT 2020