pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-07-02 18:00:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

experimental change to use groff instead of man2html for HTML man pages; man page updates for reserved words; fix for pattern matching bracket expression ranges; readline changes to disallow defining some recursive keyboard macros

Browse Source
This commit is contained in:
Chet Ramey
2025-09-18 17:26:51 -04:00
parent a451bfc3f5
commit b88cd1c366
24 changed files with 18920 additions and 19320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/glob/smatch.c
+1 -1
View File
@@ -390,7 +390,7 @@ charcmp_wc (wint_t c1, wint_t c2, int forcecoll)
if (c1 == c2)
return 0;
if (forcecoll == 0 && glob_asciirange && c1 <= UCHAR_MAX && c2 <= UCHAR_MAX)
if (forcecoll == 0 && glob_asciirange)
return ((int)(c1 - c2));
s1[0] = c1;
lib/readline/macro.c
+4 -2
View File
@@ -241,11 +241,13 @@ _rl_kill_kbd_macro (void)
End the definition with rl_end_kbd_macro ().
If a numeric argument was explicitly typed, then append this
definition to the end of the existing macro, and start by
re-executing the existing macro. */
re-executing the existing macro.
We don't allow recursive keyboard macro definitions or keyboard macro
definitions while reading input from a bound macro. */
int
rl_start_kbd_macro (int ignore1, int ignore2)
{
if (RL_ISSTATE (RL_STATE_MACRODEF))
if (RL_ISSTATE (RL_STATE_MACRODEF|RL_STATE_MACROINPUT))
{
_rl_abort_internal ();
return 1;
lib/readline/readline.c
+2 -2
View File
@@ -890,7 +890,7 @@ _rl_dispatch_subseq (register int key, Keymap map, int got_subseq)
{
if (map[ESC].type == ISKMAP)
{
if (RL_ISSTATE (RL_STATE_MACRODEF))
if (RL_ISSTATE (RL_STATE_MACRODEF) && RL_ISSTATE (RL_STATE_MACROINPUT) == 0)
_rl_add_macro_char (ESC);
RESIZE_KEYSEQ_BUFFER ();
rl_executing_keyseq[rl_key_sequence_length++] = ESC;
@@ -903,7 +903,7 @@ _rl_dispatch_subseq (register int key, Keymap map, int got_subseq)
return 0;
}
if (RL_ISSTATE (RL_STATE_MACRODEF))
if (RL_ISSTATE (RL_STATE_MACRODEF) && RL_ISSTATE (RL_STATE_MACROINPUT) == 0)
_rl_add_macro_char (key);
r = 0;
lib/readline/text.c
+3 -3
View File
@@ -1047,7 +1047,7 @@ _rl_insert_next (int count)
if (c < 0)
return 1;
if (RL_ISSTATE (RL_STATE_MACRODEF))
if (RL_ISSTATE (RL_STATE_MACRODEF) && RL_ISSTATE (RL_STATE_MACROINPUT) == 0)
_rl_add_macro_char (c);
#if defined (HANDLE_SIGNALS)
@@ -1793,7 +1793,7 @@ _rl_char_search (int count, int fdir, int bdir)
if (mb_len <= 0)
return 1;
if (RL_ISSTATE (RL_STATE_MACRODEF))
if (RL_ISSTATE (RL_STATE_MACRODEF) && RL_ISSTATE (RL_STATE_MACROINPUT) == 0)
for (i = 0; i < mb_len; i++)
_rl_add_macro_char (mbchar[i]);
@@ -1813,7 +1813,7 @@ _rl_char_search (int count, int fdir, int bdir)
if (c < 0)
return 1;
if (RL_ISSTATE (RL_STATE_MACRODEF))
if (RL_ISSTATE (RL_STATE_MACRODEF) && RL_ISSTATE (RL_STATE_MACROINPUT) == 0)
_rl_add_macro_char (c);
if (count < 0)