You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.7 KiB
35 lines
1.7 KiB
6 years ago
|
*** ../bash-5.0-patched/bashhist.c 2018-07-05 22:41:14.000000000 -0400
|
||
|
--- bashhist.c 2019-02-20 16:20:04.000000000 -0500
|
||
|
***************
|
||
|
*** 561,573 ****
|
||
|
if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
|
||
|
{
|
||
|
/* If we are expanding the second or later line of a multi-line
|
||
|
command, decrease history_length so references to history expansions
|
||
|
in these lines refer to the previous history entry and not the
|
||
|
current command. */
|
||
|
if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
|
||
|
history_length--;
|
||
|
expanded = history_expand (line, &history_value);
|
||
|
if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
|
||
|
! history_length++;
|
||
|
|
||
|
if (expanded)
|
||
|
--- 561,576 ----
|
||
|
if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
|
||
|
{
|
||
|
+ int old_len;
|
||
|
+
|
||
|
/* If we are expanding the second or later line of a multi-line
|
||
|
command, decrease history_length so references to history expansions
|
||
|
in these lines refer to the previous history entry and not the
|
||
|
current command. */
|
||
|
+ old_len = history_length;
|
||
|
if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
|
||
|
history_length--;
|
||
|
expanded = history_expand (line, &history_value);
|
||
|
if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
|
||
|
! history_length = old_len;
|
||
|
|
||
|
if (expanded)
|