mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-07-12 22:50:49 +02:00
fix for $_ when executing $PROMPT_COMMAND; fix for extra line in history after here-document in command substitution
This commit is contained in:
+7
-14
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user