mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-08-08 03:02:40 +02:00
fixes for glibc time/gettimeofday issue; fix issue with history file containing one line too few if saving timestamps; fix for signal arriving while displaying readline completions
This commit is contained in:
@@ -1630,7 +1630,7 @@ rl_display_match_list (char **matches, int len, int max)
|
||||
if (_rl_page_completions && lines >= (_rl_screenheight - 1) && i < count)
|
||||
{
|
||||
lines = _rl_internal_pager (lines);
|
||||
if (lines < 0)
|
||||
if (lines < 0 || _rl_complete_display_matches_interrupt)
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1658,7 +1658,7 @@ rl_display_match_list (char **matches, int len, int max)
|
||||
if (_rl_page_completions && lines >= _rl_screenheight - 1)
|
||||
{
|
||||
lines = _rl_internal_pager (lines);
|
||||
if (lines < 0)
|
||||
if (lines < 0 || _rl_complete_display_matches_interrupt)
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1745,7 +1745,9 @@ display_matches (char **matches)
|
||||
}
|
||||
}
|
||||
|
||||
rl_display_match_list (matches, len, max);
|
||||
/* We rely on the caller to set MATCHES to 0 when this returns. */
|
||||
if (_rl_complete_display_matches_interrupt == 0)
|
||||
rl_display_match_list (matches, len, max);
|
||||
|
||||
rl_forced_update_display ();
|
||||
rl_display_fixed = 1;
|
||||
|
||||
Reference in New Issue
Block a user