diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog index 2277e707..1659e245 100644 --- a/CWRU/CWRU.chlog +++ b/CWRU/CWRU.chlog @@ -5090,7 +5090,9 @@ bashline.c ---- builtins/shopt.def - we need the extern declaration for syslog_history if SYSLOG_HISTORY - is defined, since it's used even if SYSLOG_SHOPT is not defined + is defined, since it's used even if SYSLOG_SHOPT is not defined. + From a Gentoo Linux bug report, eventually reported to bug-bash by + Tomas Mozes 1/25 ---- @@ -5786,3 +5788,10 @@ bashhist.c not currently saving commands in the history list (remember_on_history == 0). Prompted by report from Paul Wise + + 4/20 + ---- +doc/bash.1,lib/readline/doc/rluser.texi + - make it clear that the `bind' builtin can be used to set readline + keybindings and variables. Suggestion from Dan Jacobson + diff --git a/doc/bash.1 b/doc/bash.1 index 7cf5de29..b109c5c9 100644 --- a/doc/bash.1 +++ b/doc/bash.1 @@ -5,12 +5,12 @@ .\" Case Western Reserve University .\" chet.ramey@case.edu .\" -.\" Last Change: Sun Mar 24 14:05:55 EDT 2019 +.\" Last Change: Sat Apr 20 12:32:20 EDT 2019 .\" .\" bash_builtins, strip all but Built-Ins section .if \n(zZ=1 .ig zZ .if \n(zY=1 .ig zY -.TH BASH 1 "2019 March 24" "GNU Bash 5.0" +.TH BASH 1 "2019 April 20" "GNU Bash 5.0" .\" .\" There's some problem with having a `@' .\" in a tagged paragraph with the BSD man macros. @@ -5640,6 +5640,10 @@ file with a statement of the form .PP \fBset\fP \fIvariable\-name\fP \fIvalue\fP .RE +or using the \fBbind\fP builtin command (see +.SM +.B SHELL BUILTIN COMMANDS +below). .PP Except where noted, readline variables can take the values .B On diff --git a/doc/version.texi b/doc/version.texi index aad2600d..abb7722f 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -2,10 +2,10 @@ Copyright (C) 1988-2019 Free Software Foundation, Inc. @end ignore -@set LASTCHANGE Fri Apr 12 16:27:08 EDT 2019 +@set LASTCHANGE Sat Apr 20 12:32:57 EDT 2019 @set EDITION 5.0 @set VERSION 5.0 -@set UPDATED 12 April 2019 +@set UPDATED 20 April 2019 @set UPDATED-MONTH April 2019 diff --git a/lib/readline/doc/readline.3 b/lib/readline/doc/readline.3 index be89c2df..24fad7dc 100644 --- a/lib/readline/doc/readline.3 +++ b/lib/readline/doc/readline.3 @@ -8,7 +8,7 @@ .\" .\" Last Change: Thu Dec 28 14:49:51 EST 2017 .\" -.TH READLINE 3 "2017 December 28" "GNU Readline 7.0" +.TH READLINE 3 "2017 December 28" "GNU Readline 8.0" .\" .\" File Name macro. This used to be `.PN', for Path Name, .\" but Sun doesn't seem to like that very much. diff --git a/lib/readline/doc/rluser.texi b/lib/readline/doc/rluser.texi index e8cb9a45..41f1da46 100644 --- a/lib/readline/doc/rluser.texi +++ b/lib/readline/doc/rluser.texi @@ -350,6 +350,11 @@ file is taken from the value of the environment variable @env{INPUTRC}. If that variable is unset, the default is @file{~/.inputrc}. If that file does not exist or cannot be read, the ultimate default is @file{/etc/inputrc}. +@ifset BashFeatures +The @w{@code{bind}} builtin command can also be used to set Readline +keybindings and variables. +@xref{Bash Builtins}. +@end ifset When a program which uses the Readline library starts up, the init file is read, and the key bindings are set. @@ -2380,7 +2385,7 @@ Many more examples -- an extensive collection of completions for most of the common GNU, Unix, and Linux commands -- are available as part of the bash_completion project. This is installed by default on many GNU/Linux distributions. Originally written by Ian Macdonald, the project now lives -at @url{https://salsa.debian.org/debian/bash-completion}. There are ports for +at @url{https://github.com/scop/bash-completion/}. There are ports for other systems such as Solaris and Mac OS X. An older version of the bash_completion package is distributed with bash diff --git a/variables.c b/variables.c index 2a9753a5..83c4ce3a 100644 --- a/variables.c +++ b/variables.c @@ -363,6 +363,11 @@ initialize_shell_variables (env, privmode) /* Now, name = env variable name, string = env variable value, and char_index == strlen (name) */ +if (STREQ (name, "BASHOPTS")) + itrace("initialize_shell_variables: processing BASHOPTS"); +if (STREQ (name, "BASH_COMPAT")) + itrace("initialize_shell_variables: processing BASH_COMPAT"); + temp_var = (SHELL_VAR *)NULL; #if defined (FUNCTION_IMPORT)