--- a/doc/doxyhtml/Doxyfile.in	Wed Feb 21 15:57:27 2024 -0500
+++ b/doc/doxyhtml/Doxyfile.in	Thu Feb 22 15:34:21 2024 -0500
@@ -76,7 +76,7 @@
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = @abs_top_builddir@/etc/icons/octave-logo-48.png
+PROJECT_LOGO           = @abs_top_srcdir@/etc/icons/octave-logo-48.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is

--- a/libgui/src/gui-settings.h	Wed Feb 21 15:57:27 2024 -0500
+++ b/libgui/src/gui-settings.h	Thu Feb 22 15:34:21 2024 -0500
@@ -115,14 +115,14 @@
   uint uint_value (const gui_pref& pref) const;
 
   /*!
-    Reading a color from the given QVaraitn @p def taking different
+    Reading a color from the given QVariant @p def taking different
     color modes into account. The default value for a second color mode
     @p mode=1 is deterimined from the standard default value @p mode=0
     by inverting the lightness
       \f{eqnarray*}{
          H_1 &=& H_0\\
          S_1 &=& S_0\\
-         L_1 &=& 1.0 - 0.85 L_0    L_0 > 0.3
+         L_1 &=& 1.0 - 0.85 L_0    L_0 > 0.3\\
          L_1 &=& 1.0 - 0.70 L_0    L_0 < 0.3
       \f}
 

--- a/libinterp/corefcn/debug.cc	Wed Feb 21 15:57:27 2024 -0500
+++ b/libinterp/corefcn/debug.cc	Thu Feb 22 15:34:21 2024 -0500
@@ -597,19 +597,19 @@
 @deftypefn  {} {} dbtype
 @deftypefnx {} {} dbtype @var{lineno}
 @deftypefnx {} {} dbtype @var{startl:endl}
-@deftypefnx {} {} dbtype @var{startl:end}
+@deftypefnx {} {} dbtype @var{startl}:end
 @deftypefnx {} {} dbtype @var{fcn}
 @deftypefnx {} {} dbtype @var{fcn} @var{lineno}
 @deftypefnx {} {} dbtype @var{fcn} @var{startl:endl}
-@deftypefnx {} {} dbtype @var{fcn} @var{startl:end}
+@deftypefnx {} {} dbtype @var{fcn} @var{startl}:end
 Display a script file with line numbers.
 
 When called with no arguments in debugging mode, display the script file
 currently being debugged.
 
 An optional range specification can be used to list only a portion of the
-file.  The special keyword @qcode{"end"} is a valid line number
-specification for the last line of the file.
+file.  The special keyword @qcode{"end"} is a valid line number specification
+for the last line of the file.
 
 When called with the name of a function, list that script file with line
 numbers.
@@ -1085,8 +1085,9 @@
            doc: /* -*- texinfo -*-
 @deftypefn  {} {} dbquit
 @deftypefnx {} {} dbquit all
-Quit debugging mode immediately without further code execution.  With no
-arguments, exit the current debugging level.  With argument @code{all},
+Quit debugging mode immediately without further code execution.
+
+With no arguments, exit the current debugging level.  With argument @code{all},
 exit all debugging levels and return to the Octave prompt.
 @seealso{dbcont, dbstep}
 @end deftypefn */)

--- a/libinterp/parse-tree/pt-eval.cc	Wed Feb 21 15:57:27 2024 -0500
+++ b/libinterp/parse-tree/pt-eval.cc	Thu Feb 22 15:34:21 2024 -0500
@@ -1409,7 +1409,13 @@
 
   // Go up to the nearest user code frame.
 
-  frame.protect_var (m_debug_frame);
+  tree_evaluator& tw = m_interpreter.get_evaluator ();
+
+  frame.add ([&tw, saved_frame = m_debug_frame] ()
+  {
+    if (! tw.dbstep_flag ())
+      tw.debug_frame (saved_frame);
+  });
 
   m_debug_frame = m_call_stack.dbupdown (0);