comparison libinterp/octave.cc @ 18128:4a4897cd6da1 gui-release

maint: Periodic merge of stable to gui-release.
author John W. Eaton <jwe@octave.org>
date Wed, 11 Dec 2013 22:22:28 -0500
parents d76f790b4eec 25e87795f437
children e473c4853afc
comparison
equal deleted inserted replaced
18127:d96747f74b1e 18128:4a4897cd6da1
495 disable_warning ("Octave:abbreviated-property-match"); 495 disable_warning ("Octave:abbreviated-property-match");
496 disable_warning ("Octave:fopen-file-in-path"); 496 disable_warning ("Octave:fopen-file-in-path");
497 disable_warning ("Octave:function-name-clash"); 497 disable_warning ("Octave:function-name-clash");
498 disable_warning ("Octave:load-file-in-path"); 498 disable_warning ("Octave:load-file-in-path");
499 disable_warning ("Octave:possible-matlab-short-circuit-operator"); 499 disable_warning ("Octave:possible-matlab-short-circuit-operator");
500
501 // Initialized to "error" by default.
502 set_warning_state ("Octave:noninteger-range-as-index", "on");
500 } 503 }
501 504
502 // EMBEDDED is declared int instead of bool because this function is 505 // EMBEDDED is declared int instead of bool because this function is
503 // declared extern "C". 506 // declared extern "C".
504 507
717 720
718 octave_thread::init (); 721 octave_thread::init ();
719 722
720 set_default_prompts (); 723 set_default_prompts ();
721 724
725 // Initialize default warning state before --traditional option may
726 // reset them.
727
728 initialize_default_warning_state ();
729
722 if (traditional) 730 if (traditional)
723 maximum_braindamage (); 731 maximum_braindamage ();
724 732
725 init_signals (); 733 init_signals ();
726 734
733 741
734 if (octave_NaN == -1) 742 if (octave_NaN == -1)
735 F77_FUNC (xerbla, XERBLA) ("octave", 13 F77_CHAR_ARG_LEN (6)); 743 F77_FUNC (xerbla, XERBLA) ("octave", 13 F77_CHAR_ARG_LEN (6));
736 744
737 initialize_error_handlers (); 745 initialize_error_handlers ();
738
739 initialize_default_warning_state ();
740 746
741 if (! embedded) 747 if (! embedded)
742 install_signal_handlers (); 748 install_signal_handlers ();
743 else 749 else
744 quit_allowed = false; 750 quit_allowed = false;