# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1366182549 14400
# Node ID f3a63fdbd725244c2861d226d8a5b9733e1fcb8c
# Parent  7ca7e7d5eb916c4a4f805df3a037fc028661f0ed
finish botched changeset 7ca7e7d5eb91

diff --git a/libinterp/interpfcn/debug.cc b/libinterp/interpfcn/debug.cc
--- a/libinterp/interpfcn/debug.cc
+++ b/libinterp/interpfcn/debug.cc
@@ -289,7 +289,18 @@
       std::string file = dbg_fcn->fcn_file_name ();
 
       if (cmds)
-        retval = cmds->add_breakpoint (file, line);
+        {
+          retval = cmds->add_breakpoint (file, line);
+
+          for (intmap_iterator p = retval.begin (); p != retval.end (); p++)
+            {
+              if (p->second != 0)
+                {
+                  bp_set.insert (fname);
+                  break;
+                }
+            }
+        }
     }
   else
     error ("add_breakpoint: unable to find the requested function\n");
diff --git a/libinterp/parse-tree/pt-stmt.cc b/libinterp/parse-tree/pt-stmt.cc
--- a/libinterp/parse-tree/pt-stmt.cc
+++ b/libinterp/parse-tree/pt-stmt.cc
@@ -202,7 +202,7 @@
 
   for (int i = 0; i < len; i++)
     {
-      const_intmap_iterator p = line.find (i);
+      bp_table::const_intmap_iterator p = line.find (i);
 
       if (p != line.end ())
         {
@@ -210,13 +210,8 @@
 
           retval[i] = set_breakpoint (lineno);
 
-          if (retval[i] != 0)
-            {
-              bp_set.insert (fname);
-
-              if (! file.empty ())
-                octave_link::update_breakpoint (true, file, retval[i]);
-            }
+          if (retval[i] != 0 && ! file.empty ())
+            octave_link::update_breakpoint (true, file, retval[i]);
         }
     }