--- a/libgui/src/m-editor/octave-qscintilla.cc	Tue Dec 06 15:17:16 2022 -0500
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Tue Dec 06 15:37:43 2022 -0500
@@ -72,8 +72,8 @@
 // Used for testing the last word of an "if" etc. line,
 // or the first word of the following line.
 
-namespace octave
-{
+OCTAVE_BEGIN_NAMESPACE(octave)
+
   static bool
   is_end (const QString& candidate, const QString& opening)
   {
@@ -482,7 +482,6 @@
     return QStringList ("%");  // should never happen
   }
 
-
   // provide the style at a specific position
   int octave_qscintilla::get_style (int pos)
   {
@@ -748,7 +747,6 @@
 
         setIndentation (line, indent_column);
 
-
         int bpos = begin_block_regexp.indexIn (line_text);
         if (bpos > -1)
           {
@@ -1053,7 +1051,6 @@
        });
   }
 
-
   // wrappers for dbstop related context menu items
 
   // FIXME: Why can't the data be sent as the argument to the function???
@@ -1369,6 +1366,6 @@
     m_debug_mode = false;
   }
 
-}
+OCTAVE_END_NAMESPACE(octave)
 
 #endif