mirror of
https://github.com/fish-shell/fish-shell.git
synced 2025-02-20 15:40:45 +08:00
Make 'exit' work in even handlers
darcs-hash:20060208092429-ac50b-f88534a423dc194fdb6453d66b5d4cc7733e54fb.gz
This commit is contained in:
parent
73a9c8bcb8
commit
2555353161
9
reader.c
9
reader.c
|
@ -875,10 +875,9 @@ void reader_destroy()
|
|||
|
||||
void reader_exit( int do_exit )
|
||||
{
|
||||
if( is_interactive )
|
||||
if( data )
|
||||
data->end_loop=do_exit;
|
||||
else
|
||||
end_loop=do_exit;
|
||||
end_loop=do_exit;
|
||||
}
|
||||
|
||||
void repaint()
|
||||
|
@ -2978,8 +2977,10 @@ int reader_read( int fd )
|
|||
If the exit command was called in a script, only exit the
|
||||
script, not the program
|
||||
*/
|
||||
if( data )
|
||||
data->end_loop = 0;
|
||||
end_loop = 0;
|
||||
|
||||
|
||||
is_interactive = shell_was_interactive;
|
||||
signal_set_handlers();
|
||||
return res;
|
||||
|
|
Loading…
Reference in New Issue
Block a user