fix for $_ when executing $PROMPT_COMMAND; fix for extra line in history after here-document in command substitution

This commit is contained in:
Chet Ramey
2023-02-13 10:48:05 -05:00
parent 3eab48247a
commit d7a6d947df
11 changed files with 140 additions and 72 deletions
+7 -14
View File
@@ -2713,6 +2713,13 @@ set_up_new_line (char *new_line)
{
int old_point, at_end;
/* If we didn't expand anything, don't change anything. */
if (STREQ (new_line, rl_line_buffer))
{
free (new_line);
return;
}
old_point = rl_point;
at_end = rl_point == rl_end;
@@ -2741,13 +2748,6 @@ alias_expand_line (int count, int ignore)
new_line = alias_expand (rl_line_buffer);
/* If we didn't expand anything, don't change anything. */
if (new_line && STREQ (new_line, rl_line_buffer))
{
free (new_line);
return (0);
}
if (new_line)
{
set_up_new_line (new_line);
@@ -2770,13 +2770,6 @@ history_expand_line (int count, int ignore)
new_line = history_expand_line_internal (rl_line_buffer);
/* If we didn't expand anything, don't change anything. */
if (new_line && STREQ (new_line, rl_line_buffer))
{
free (new_line);
return (0);
}
if (new_line)
{
set_up_new_line (new_line);