commit bash-20050810 snapshot

This commit is contained in:
Chet Ramey
2011-12-03 13:49:42 -05:00
parent f5635ecdc9
commit 055a1bf5bc
16 changed files with 978 additions and 787 deletions
+1 -1
View File
@@ -460,7 +460,7 @@ rl_redisplay ()
if (!rl_display_prompt)
rl_display_prompt = "";
if (invisible_line == 0)
if (invisible_line == 0 || vis_lbreaks == 0)
{
init_line_structures (0);
rl_on_new_line ();
+4 -3
View File
@@ -254,7 +254,8 @@ expand_prompt (pmt, lp, lip, niflp, vlp)
else if (ignoring && *p == RL_PROMPT_END_IGNORE)
{
ignoring = 0;
last = r - ret - 1;
if (p[-1] != RL_PROMPT_START_IGNORE)
last = r - ret - 1;
continue;
}
else
@@ -423,6 +424,7 @@ init_line_structures (minsize)
invisible_line[n] = 1;
}
kill(getpid(), SIGWINCH);
if (vis_lbreaks == 0)
{
/* should be enough. */
@@ -459,7 +461,7 @@ rl_redisplay ()
if (!rl_display_prompt)
rl_display_prompt = "";
if (invisible_line == 0)
if (invisible_line == 0 || vis_lbreaks == 0)
{
init_line_structures (0);
rl_on_new_line ();
@@ -602,7 +604,6 @@ rl_redisplay ()
num = 0;
#endif
fprintf(stderr, "rl_redisplay: local_prompt = %s\r\n", local_prompt);
/* prompt_invis_chars_first_line is the number of invisible characters in
the first physical line of the prompt.
wrap_offset - prompt_invis_chars_first_line is the number of invis