From 8086db3318caec84ed28b10df07bf7a2db10e5f4 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Tue, 3 Nov 2020 14:39:29 -0500 Subject: Readline-8.1-rc2 release --- CHANGELOG | 9 +++++ CHANGES | 9 ++++- INSTALL | 5 +++ Makefile.in | 2 +- NEWS | 3 +- bind.c | 4 +- configure | 21 +++++++++- configure.ac | 12 +++++- doc/history.0 | 2 +- doc/history.3 | 2 +- doc/history.dvi | Bin 72244 -> 72252 bytes doc/history.html | 6 +-- doc/history.info | 46 +++++++++++----------- doc/history.pdf | Bin 204483 -> 204488 bytes doc/history.ps | 40 +++++++++---------- doc/history_3.ps | 4 +- doc/hstech.texi | 2 +- doc/readline.0 | 4 +- doc/readline.3 | 4 +- doc/readline.dvi | Bin 323584 -> 323600 bytes doc/readline.html | 8 ++-- doc/readline.info | 110 ++++++++++++++++++++++++++--------------------------- doc/readline.pdf | Bin 398664 -> 398680 bytes doc/readline.ps | 16 ++++---- doc/readline_3.ps | 62 +++++++++++++++--------------- doc/rluser.texi | 2 +- doc/rluserman.dvi | Bin 114796 -> 114812 bytes doc/rluserman.html | 8 ++-- doc/rluserman.info | 54 +++++++++++++------------- doc/rluserman.pdf | Bin 232889 -> 232909 bytes doc/rluserman.ps | 20 +++++----- doc/version.texi | 6 +-- isearch.c | 12 ++++-- kill.c | 3 +- readline.c | 3 +- rlprivate.h | 5 +++ search.c | 2 +- shlib/Makefile.in | 2 +- terminal.c | 13 ++++++- 39 files changed, 289 insertions(+), 212 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f9badf1..5c24e91 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1394,3 +1394,12 @@ configure.ac configure.ac - add -Wno-parentheses -Wno-format-security to CFLAGS if gcc (or clang) is the compiler + + 10/29 + ----- +configure.ac + - --enable-bracketed-paste-default: new invocation option, toggles the + default value of enable-bracketed-paste (on by default) + +INSTALL + - document new --enable-bracketed-paste-default configure option diff --git a/CHANGES b/CHANGES index e4534ad..79628e8 100644 --- a/CHANGES +++ b/CHANGES @@ -77,6 +77,12 @@ x. Fixed a bug that could cause an application with an application-specific redisplay function to crash if the line data structures had not been initialized. +y. Terminals that are named "dumb" or unknown do not enable bracketed paste + by default. + +z. Ensure that disabling bracketed paste turns off highlighting the incremental + search string when the search is successful. + 2. New Features in Readline a. If a second consecutive completion attempt produces matches where the first @@ -101,7 +107,8 @@ f. New active mark and face feature: when enabled, it will highlight the text g. Readline sets the mark in several additional commands. -h. Bracketed paste mode is enabled by default (for now). +h. Bracketed paste mode is enabled by default. There is a configure-time + option (--enable-bracketed-paste-default) to set the default to on or off. i. Readline tries to take advantage of the more regular structure of UTF-8 characters to identify the beginning and end of characters when moving diff --git a/INSTALL b/INSTALL index e11be22..4f0d7b0 100644 --- a/INSTALL +++ b/INSTALL @@ -183,6 +183,11 @@ The readline `configure' recognizes a single `--with-PACKAGE' option: `--enable-static' Build the static libraries by default. The default is `yes'. + +`--enable-bracketed-paste-default' + Enable bracketed paste by default, so the initial value of the + `enable-bracketed-paste' Readline variable is `on'. The default + is `yes'. Shared Libraries ================ diff --git a/Makefile.in b/Makefile.in index 7803f27..c57db60 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,7 +75,7 @@ ETAGS = etags CTAGS = ctags -w CFLAGS = @CFLAGS@ -LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"' +LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"' @BRACKETED_PASTE@ CPPFLAGS = @CPPFLAGS@ DEFS = @DEFS@ @CROSS_COMPILE@ diff --git a/NEWS b/NEWS index d371d20..c328628 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,8 @@ f. New active mark and face feature: when enabled, it will highlight the text g. Readline sets the mark in several additional commands. -h. Bracketed paste mode is enabled by default (for now). +h. Bracketed paste mode is enabled by default. There is a configure-time + option (--enable-bracketed-paste-default) to set the default to on or off. i. Readline tries to take advantage of the more regular structure of UTF-8 characters to identify the beginning and end of characters when moving diff --git a/bind.c b/bind.c index 3cbed2c..87596dc 100644 --- a/bind.c +++ b/bind.c @@ -1812,7 +1812,7 @@ static const struct { { "convert-meta", &_rl_convert_meta_chars_to_ascii, 0 }, { "disable-completion", &rl_inhibit_completion, 0 }, { "echo-control-characters", &_rl_echo_control_chars, 0 }, - { "enable-bracketed-paste", &_rl_enable_bracketed_paste, 0 }, + { "enable-bracketed-paste", &_rl_enable_bracketed_paste, V_SPECIAL }, { "enable-keypad", &_rl_enable_keypad, 0 }, { "enable-meta-key", &_rl_enable_meta, 0 }, { "expand-tilde", &rl_complete_with_tilde_expansion, 0 }, @@ -1878,6 +1878,8 @@ hack_special_boolean_var (int i) } else if (_rl_stricmp (name, "show-mode-in-prompt") == 0) _rl_reset_prompt (); + else if (_rl_stricmp (name, "enable-bracketed-paste") == 0) + _rl_enable_active_region = _rl_enable_bracketed_paste; } typedef int _rl_sv_func_t PARAMS((const char *)); diff --git a/configure b/configure index 9fac150..5a0bf2f 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac for Readline 8.1, version 2.89. +# From configure.ac for Readline 8.1, version 2.90. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for readline 8.1. # @@ -673,6 +673,7 @@ CFLAGS CC SET_MAKE CROSS_COMPILE +BRACKETED_PASTE host_os host_vendor host_cpu @@ -727,6 +728,7 @@ enable_multibyte enable_shared enable_static enable_install_examples +enable_bracketed_paste_default enable_largefile ' ac_precious_vars='build_alias @@ -1356,6 +1358,9 @@ Optional Features: --enable-static build static libraries [[default=YES]] --disable-install-examples don't install examples [[default=install]] + --disable-bracketed-paste-default + disable bracketed paste by default + [[default=enable]] --disable-largefile omit support for large files Optional Packages: @@ -2568,6 +2573,7 @@ opt_multibyte=yes opt_static_libs=yes opt_shared_libs=yes opt_install_examples=yes +opt_bracketed_paste_default=yes # Check whether --enable-multibyte was given. if test "${enable_multibyte+set}" = set; then : @@ -2590,11 +2596,24 @@ if test "${enable_install_examples+set}" = set; then : fi +# Check whether --enable-bracketed-paste-default was given. +if test "${enable_bracketed_paste_default+set}" = set; then : + enableval=$enable_bracketed_paste_default; opt_bracketed_paste_default=$enableval +fi + + if test $opt_multibyte = no; then $as_echo "#define NO_MULTIBYTE_SUPPORT 1" >>confdefs.h fi +if test $opt_bracketed_paste_default = yes; then + BRACKETED_PASTE='-DBRACKETED_PASTE_DEFAULT=1' +else + BRACKETED_PASTE='-DBRACKETED_PASTE_DEFAULT=0' +fi + + CROSS_COMPILE= diff --git a/configure.ac b/configure.ac index edd78c9..147bae5 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. # You should have received a copy of the GNU General Public License # along with this program. If not, see . -AC_REVISION([for Readline 8.1, version 2.89]) +AC_REVISION([for Readline 8.1, version 2.90]) AC_INIT(readline, 8.1, bug-readline@gnu.org) @@ -52,16 +52,26 @@ opt_multibyte=yes opt_static_libs=yes opt_shared_libs=yes opt_install_examples=yes +opt_bracketed_paste_default=yes AC_ARG_ENABLE(multibyte, AC_HELP_STRING([--enable-multibyte], [enable multibyte characters if OS supports them]), opt_multibyte=$enableval) AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval) AC_ARG_ENABLE(static, AC_HELP_STRING([--enable-static], [build static libraries [[default=YES]]]), opt_static_libs=$enableval) AC_ARG_ENABLE(install-examples, AC_HELP_STRING([--disable-install-examples], [don't install examples [[default=install]]]), opt_install_examples=$enableval) +AC_ARG_ENABLE(bracketed-paste-default, AC_HELP_STRING([--disable-bracketed-paste-default], [disable bracketed paste by default [[default=enable]]]), opt_bracketed_paste_default=$enableval) + if test $opt_multibyte = no; then AC_DEFINE(NO_MULTIBYTE_SUPPORT) fi +if test $opt_bracketed_paste_default = yes; then + BRACKETED_PASTE='-DBRACKETED_PASTE_DEFAULT=1' +else + BRACKETED_PASTE='-DBRACKETED_PASTE_DEFAULT=0' +fi +AC_SUBST(BRACKETED_PASTE) + dnl load up the cross-building cache file -- add more cases and cache dnl files as necessary diff --git a/doc/history.0 b/doc/history.0 index 5f5e703..3c1a794 100644 --- a/doc/history.0 +++ b/doc/history.0 @@ -384,7 +384,7 @@ HISTORY(3) Library Functions Manual HISTORY(3) -1 if there was an error in expansion; 2 if the returned line should be displayed, but not exe- cuted, as with the :p modifier. - If an error ocurred in expansion, then output contains a descriptive + If an error occurred in expansion, then output contains a descriptive error message. char * get_history_event (const char *string, int *cindex, int qchar) diff --git a/doc/history.3 b/doc/history.3 index 9b787c6..df6cd37 100644 --- a/doc/history.3 +++ b/doc/history.3 @@ -552,7 +552,7 @@ if the returned line should be displayed, but not executed, as with the \fB:p\fP modifier. .PD .RE -If an error ocurred in expansion, then \fIoutput\fP contains a descriptive +If an error occurred in expansion, then \fIoutput\fP contains a descriptive error message. .Fn3 "char *" get_history_event "const char *string" "int *cindex" "int qchar" diff --git a/doc/history.dvi b/doc/history.dvi index 5722192..9734c24 100644 Binary files a/doc/history.dvi and b/doc/history.dvi differ diff --git a/doc/history.html b/doc/history.html index 8aa3b57..3110cf3 100644 --- a/doc/history.html +++ b/doc/history.html @@ -1,6 +1,6 @@ - + + +