# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1560528841 18000
# Node ID 04889e45f54ee00797fe3b5de4bf396c63756adc
# Parent  2d9decd77e580d713a5700c81ef257b3ae376f64# Parent  f7bf27159cf7b0fb6664ab515b3336f506f72497
maint: Merge stable to default.

diff -r 2d9decd77e58 -r 04889e45f54e libinterp/parse-tree/bp-table.cc
--- a/libinterp/parse-tree/bp-table.cc	Thu Jun 13 17:40:36 2019 -0500
+++ b/libinterp/parse-tree/bp-table.cc	Fri Jun 14 11:14:01 2019 -0500
@@ -467,21 +467,21 @@
       }
   }
 
-  /*
-    %!test
-    %! dbclear all;   # Clear out breakpoints before test
-    %! dbstop help;
-    %! dbstop in ls;
-    %! dbstop help at 100;
-    %! dbstop in ls 100;
-    %! dbstop help 201 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], [48, 100, 201, 58, 100]);
-    %! assert (s.errs, {"Octave:undefined-function"});
-  */
+/*
+%!test
+%! dbclear all;   # Clear out breakpoints before test
+%! dbstop help;
+%! dbstop in ls;
+%! dbstop help at 100;
+%! dbstop in ls 100;    ## 100 is a comment; code line is at 103
+%! dbstop help 201 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], [48, 100, 201, 58, 103]);
+%! assert (s.errs, {"Octave:undefined-function"});
+*/
 
   void bp_table::set_stop_flag (const char *who, const std::string& condition,
                                 bool on_off)