# HG changeset patch
# User Rik <rik@octave.org>
# Date 1650574407 25200
# Node ID abca9eac1ec9a6d6d80e4af6d708fd4cc5802f4e
# Parent  cd741166d6fb85c5386bbf3e3f9b33daea108783# Parent  0d06084693dd90a2c16a7ebe23dbeee92f518ae7
maint: merge stable to default.

diff -r cd741166d6fb -r abca9eac1ec9 libinterp/parse-tree/bp-table.cc
--- a/libinterp/parse-tree/bp-table.cc	Thu Apr 21 12:04:09 2022 -0700
+++ b/libinterp/parse-tree/bp-table.cc	Thu Apr 21 13:53:27 2022 -0700
@@ -539,13 +539,13 @@
 %! dbstop help;
 %! dbstop in ls;
 %! dbstop help at 105;  # 105 is a comment; code line is at 106
-%! dbstop in ls 104;
+%! dbstop in ls 123;    # 123 is a comment; code line is at 126
 %! dbstop help 204 if a==5;
 %! dbstop if error Octave:undefined-function;
 %! s = dbstatus;
 %! dbclear all;
 %! assert ({s.bkpt(:).name}, {"help", "help", "help>do_contents", "ls", "ls"});
-%! assert ([s.bkpt(:).line], [56, 106, 208, 63, 104]);
+%! assert ([s.bkpt(:).line], [56, 106, 208, 63, 126]);
 %! assert (s.errs, {"Octave:undefined-function"});
 */