# HG changeset patch
# User Rik <rik@octave.org>
# Date 1642026494 28800
# Node ID ad8c9d93b86d7a1977bbc49393cc0840d8936a63
# Parent  36d940c58c2ea5c71611290d06f09821e082daf4# Parent  064a8fbf91628076dfb2f25e549c67283a650f55
maint: merge stable to default.

diff -r 36d940c58c2e -r ad8c9d93b86d libgui/src/m-editor/octave-qscintilla.cc
--- 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);
   }
 
 }
diff -r 36d940c58c2e -r ad8c9d93b86d libgui/src/m-editor/octave-qscintilla.h
--- 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;
   };
 }
 
diff -r 36d940c58c2e -r ad8c9d93b86d libinterp/parse-tree/pt-eval.cc
--- 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 ());
           }
       }