Mercurial > octave
comparison libinterp/corefcn/toplev.cc @ 21359:8e94a86ca648
Do not print extra newlines to stdout on exit (bug #47258).
* toplev.cc (main_loop): in case of exception, do not print a newline if we are
exiting Octave.
* octave.cc (safe_source_file, execute_eval_option_code): idem. But in this
cases, there's no need to ever print a newline.
| author | Carnë Draug <carandraug@octave.org> |
|---|---|
| date | Fri, 26 Feb 2016 13:06:39 +0000 |
| parents | 909129eb77c5 |
| children | 8cfd1b47d49f |
comparison
equal
deleted
inserted
replaced
| 21358:f2ae78f5827f | 21359:8e94a86ca648 |
|---|---|
| 734 } | 734 } |
| 735 catch (const octave_interrupt_exception&) | 735 catch (const octave_interrupt_exception&) |
| 736 { | 736 { |
| 737 recover_from_exception (); | 737 recover_from_exception (); |
| 738 | 738 |
| 739 octave_stdout << "\n"; | |
| 740 | |
| 741 if (quitting_gracefully) | 739 if (quitting_gracefully) |
| 742 return exit_status; | 740 return exit_status; |
| 741 | |
| 742 // Required newline when the user does Ctrl+C at the prompt. | |
| 743 octave_stdout << "\n"; | |
| 743 } | 744 } |
| 744 catch (const index_exception& e) | 745 catch (const index_exception& e) |
| 745 { | 746 { |
| 746 recover_from_exception (); | 747 recover_from_exception (); |
| 747 | 748 |