Fix bug where quiting from the read builtin could cause the prompt not to repaint

darcs-hash:20070129174501-ac50b-7e7f62ab8a1864617291208919551505bae6e156.gz
This commit is contained in:
axel 2007-01-30 03:45:01 +10:00
parent 3fff030ee2
commit 7953863b38

View file

@ -1820,11 +1820,9 @@ void reader_pop()
} }
else else
{ {
end_loop = 0;
history_set_mode( data->name ); history_set_mode( data->name );
exec_prompt();
write( 1, "\r", 1 );
s_reset( &data->screen ); s_reset( &data->screen );
repaint();
} }
} }
@ -2403,7 +2401,6 @@ wchar_t *reader_readline()
{ {
if( data->buff_len == 0 ) if( data->buff_len == 0 )
{ {
writestr( L"\n" );
data->end_loop=1; data->end_loop=1;
} }
break; break;
@ -2441,7 +2438,6 @@ wchar_t *reader_readline()
finished=1; finished=1;
data->buff_pos=data->buff_len; data->buff_pos=data->buff_len;
repaint(); repaint();
writestr( L"\n" );
break; break;
} }
@ -2644,6 +2640,7 @@ wchar_t *reader_readline()
last_char = c; last_char = c;
} }
writestr( L"\n" );
al_destroy( &comp ); al_destroy( &comp );
if( !reader_exit_forced() ) if( !reader_exit_forced() )
{ {