# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1624626541 14400
# Node ID 589d2ae0b04eb7c1e273e11b73a3925cb2b2158d
# Parent  fc8571a37d21c097b5eb23b8b6347e1955ddc83f# Parent  340d6d3dcc944b5b47b6cd3a3d93db2946ac722e
maint: Merge stable to default.

diff -r fc8571a37d21 -r 589d2ae0b04e libgui/src/m-editor/octave-qscintilla.cc
--- a/libgui/src/m-editor/octave-qscintilla.cc	Thu Jun 24 10:45:21 2021 -0400
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Fri Jun 25 09:09:01 2021 -0400
@@ -853,7 +853,7 @@
             // Define commands for not showing bp location and for resetting
             // this in case "keyboard" was within a comment
             next_bp_quiet = "__db_next_breakpoint_quiet__;\n";
-            next_bp_quiet_reset = "__db_next_breakpoint_quiet__(false);\n";
+            next_bp_quiet_reset = "\n__db_next_breakpoint_quiet__(false);";
           }
 
         // Add codeline