Mercurial > octave-nkf

comparison libinterp/corefcn/input.cc @ 19629:be7ac98fab43 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from most source files * NEWS, etc/NEWS.3, libgui/graphics/Backend.h, libgui/graphics/ButtonControl.h, libgui/graphics/EditControl.cc, libgui/graphics/Object.h, libgui/graphics/QtHandlesUtils.cc, libgui/graphics/ToolBarButton.h, libgui/graphics/__init_qt__.cc, libgui/graphics/gl-select.cc, libgui/qterminal/libqterminal/unix/TerminalView.cpp, libgui/qterminal/libqterminal/unix/TerminalView.h, libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp, libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/file-editor.cc, libgui/src/m-editor/file-editor.h, libgui/src/m-editor/octave-qscintilla.cc, libgui/src/settings-dialog.cc, libgui/src/shortcut-manager.cc, libgui/src/workspace-view.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/input.cc, libinterp/parse-tree/pt-unop.cc, liboctave/array/dSparse.h, scripts/pkg/pkg.m, scripts/polynomial/polyeig.m, test/io.tst: Strip trailing whitespace.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jan 2015 09:43:29 -0500
parents c1ce43276b86
children 0e1f5a750d00
comparison
equal deleted inserted replaced
19628:fe689210525c 19629:be7ac98fab43
182 octave_quit (); 182 octave_quit ();
183 183
184 eof = false; 184 eof = false;
185 185
186 std::string retval = command_editor::readline (s, eof); 186 std::string retval = command_editor::readline (s, eof);
187 187
188 if (! eof && retval.empty ()) 188 if (! eof && retval.empty ())
189 retval = "\n"; 189 retval = "\n";
190 190
191 if (command_editor::interrupt (false)) 191 if (command_editor::interrupt (false))
192 retval = ""; 192 retval = "";
511 { 511 {
512 unwind_protect frame; 512 unwind_protect frame;
513 513
514 bool silent = tree_evaluator::quiet_breakpoint_flag; 514 bool silent = tree_evaluator::quiet_breakpoint_flag;
515 tree_evaluator::quiet_breakpoint_flag = false; 515 tree_evaluator::quiet_breakpoint_flag = false;
516 516
517 octave_user_code *caller = octave_call_stack::caller_user_code (); 517 octave_user_code *caller = octave_call_stack::caller_user_code ();
518 std::string nm; 518 std::string nm;
519 int curr_debug_line; 519 int curr_debug_line;
520 520
521 bool have_file = false; 521 bool have_file = false;
579 } 579 }
580 } 580 }
581 581
582 if (silent) 582 if (silent)
583 command_editor::erase_empty_line (true); 583 command_editor::erase_empty_line (true);
584 584
585 std::string msg = buf.str (); 585 std::string msg = buf.str ();
586 586
587 if (! msg.empty ()) 587 if (! msg.empty ())
588 std::cerr << msg << std::endl; 588 std::cerr << msg << std::endl;
589 589