Mercurial > octave
changeset 30636:ad8c9d93b86d
maint: merge stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 12 Jan 2022 14:28:14 -0800 |
parents | 36d940c58c2e (current diff) 064a8fbf9162 (diff) |
children | 7961eb9cdc18 |
files | libinterp/parse-tree/pt-eval.cc |
diffstat | 3 files changed, 7 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/m-editor/octave-qscintilla.cc Tue Jan 11 12:17:16 2022 -0800 +++ b/libgui/src/m-editor/octave-qscintilla.cc Wed Jan 12 14:28:14 2022 -0800 @@ -113,8 +113,7 @@ octave_qscintilla::octave_qscintilla (QWidget *p, base_qobject& oct_qobj) : QsciScintilla (p), m_octave_qobj (oct_qobj), m_debug_mode (false), m_word_at_cursor (), m_selection (), m_selection_replacement (), - m_selection_line (-1), m_selection_col (-1), m_indicator_id (1), - m_tooltip_font (QToolTip::font ()) + m_selection_line (-1), m_selection_col (-1), m_indicator_id (1) { connect (this, SIGNAL (textChanged (void)), this, SLOT (text_changed (void))); @@ -1352,19 +1351,12 @@ void octave_qscintilla::handle_enter_debug_mode (void) { - // Set tool tip font to the lexers default font - m_tooltip_font = QToolTip::font (); // Save current font - QToolTip::setFont (lexer ()->defaultFont ()); - m_debug_mode = true; } void octave_qscintilla::handle_exit_debug_mode (void) { m_debug_mode = false; - - // Reset tool tip font - QToolTip::setFont (m_tooltip_font); } }
--- a/libgui/src/m-editor/octave-qscintilla.h Tue Jan 11 12:17:16 2022 -0800 +++ b/libgui/src/m-editor/octave-qscintilla.h Wed Jan 12 14:28:14 2022 -0800 @@ -154,8 +154,6 @@ int m_selection_line; int m_selection_col; int m_indicator_id; - - QFont m_tooltip_font; }; }
--- a/libinterp/parse-tree/pt-eval.cc Tue Jan 11 12:17:16 2022 -0800 +++ b/libinterp/parse-tree/pt-eval.cc Wed Jan 12 14:28:14 2022 -0800 @@ -3418,7 +3418,9 @@ { std::string name = user_function.name (); - error ("%s: function called with too many inputs", name.c_str ()); + error_with_id ("Octave:invalid-fun-call", + "%s: function called with too many inputs", + name.c_str ()); } define_parameter_list_from_arg_vector (param_list, args); @@ -3433,7 +3435,9 @@ { std::string name = user_function.name (); - error ("%s: function called with too many outputs", name.c_str ()); + error_with_id ("Octave:invalid-fun-call", + "%s: function called with too many outputs", + name.c_str ()); } }