--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liboctave/util/action-container.cc	Tue Aug 13 19:13:46 2019 -0400
@@ -0,0 +1,46 @@
+/*
+
+Copyright (C) 1993-2019 John W. Eaton
+Copyright (C) 2009-2010 VZLU Prague
+
+This file is part of Octave.
+
+Octave is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Octave is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<https://www.gnu.org/licenses/>.
+
+*/
+
+#include "action-container.h"
+#include "cmd-edit.h"
+
+namespace octave
+{
+  void action_container::run (size_t num)
+  {
+    if (num > size ())
+      num = size ();
+
+    for (size_t i = 0; i < num; i++)
+      {
+        run_first ();
+
+        // If input_interrupted is TRUE, a user callback event has
+        // requested that we break out of the readline event handler to
+        // process a command or other action.
+
+        if (command_editor::input_interrupted ())
+          break;
+      }
+  }
+}

--- a/liboctave/util/action-container.h	Fri Aug 09 11:51:44 2019 -0400
+++ b/liboctave/util/action-container.h	Tue Aug 13 19:13:46 2019 -0400
@@ -191,14 +191,7 @@
 
     virtual void run_first (void) = 0;
 
-    void run (size_t num)
-    {
-      if (num > size ())
-        num = size ();
-
-      for (size_t i = 0; i < num; i++)
-        run_first ();
-    }
+    void run (size_t num);
 
     void run (void) { run (size ()); }
 

--- a/liboctave/util/cmd-edit.cc	Fri Aug 09 11:51:44 2019 -0400
+++ b/liboctave/util/cmd-edit.cc	Tue Aug 13 19:13:46 2019 -0400
@@ -195,6 +195,8 @@
 
     void do_interrupt (bool);
 
+    bool do_input_interrupted (void);
+
     void do_handle_interrupt_signal (void);
 
     static int operate_and_get_next (int, int);
@@ -770,6 +772,12 @@
     ::octave_rl_done (arg);
   }
 
+  bool
+  gnu_readline::do_input_interrupted (void)
+  {
+    return ::octave_rl_input_interrupted ();
+  }
+
   void
   gnu_readline::do_handle_interrupt_signal (void)
   {
@@ -1638,6 +1646,12 @@
     return retval;
   }
 
+  bool
+  command_editor::input_interrupted (void)
+  {
+    return instance_ok () ? instance->do_input_interrupted  () : false;
+  }
+
   void
   command_editor::handle_interrupt_signal (void)
   {

--- a/liboctave/util/cmd-edit.h	Fri Aug 09 11:51:44 2019 -0400
+++ b/liboctave/util/cmd-edit.h	Tue Aug 13 19:13:46 2019 -0400
@@ -187,6 +187,8 @@
 
     static bool interrupt (bool = true);
 
+    static bool input_interrupted (void);
+
     static int current_command_number (void);
 
     static void reset_current_command_number (int n);
@@ -358,6 +360,8 @@
 
     virtual void do_interrupt (bool) { }
 
+    virtual bool do_input_interrupted (void) { return false; }
+
     virtual void do_handle_interrupt_signal (void) { }
 
     int do_insert_initial_input (void);

--- a/liboctave/util/module.mk	Fri Aug 09 11:51:44 2019 -0400
+++ b/liboctave/util/module.mk	Tue Aug 13 19:13:46 2019 -0400
@@ -61,6 +61,7 @@
   %reldir%/oct-rl-hist.c
 
 UTIL_SRC = \
+  %reldir%/action-container.cc \
   %reldir%/cmd-edit.cc \
   %reldir%/cmd-hist.cc \
   %reldir%/data-conv.cc \

--- a/liboctave/util/oct-rl-edit.c	Fri Aug 09 11:51:44 2019 -0400
+++ b/liboctave/util/oct-rl-edit.c	Tue Aug 13 19:13:46 2019 -0400
@@ -282,6 +282,12 @@
   rl_done = arg;
 }
 
+int
+octave_rl_input_interrupted (void)
+{
+  return rl_done;
+}
+
 char *
 octave_rl_filename_completion_function (const char *text, int state)
 {

--- a/liboctave/util/oct-rl-edit.h	Fri Aug 09 11:51:44 2019 -0400
+++ b/liboctave/util/oct-rl-edit.h	Tue Aug 13 19:13:46 2019 -0400
@@ -120,6 +120,8 @@
 
 extern void octave_rl_done (int);
 
+extern int octave_rl_input_interrupted (void);
+
 extern char * octave_rl_filename_completion_function (const char *, int);
 
 extern void octave_rl_set_basic_word_break_characters (const char *);