also provide a hook for exiting debugger * file-editor-interface.h (file_editor_interface::insert_debugger_pointer_request): Rename from file_editor_interface::handle_update_debug_pointer_request (file_editor_interface::delete_debugger_pointer_request): New function. * file-editor-tab.h, file-editor-tab.cc (file_editor_tab::insert_debugger_pointer): Rename from file_editor_tab::set_debugger_position. Change all uses. (file_editor_tab::delete_debugger_pointer): New function. * file-editor.h, file-editor.cc (file_editor::handle_insert_debugger_pointer_request): Renamem from file_editor::handle_update_debug_pointer_request. Change all uses. (file_editor::handle_delete_debugger_pointer_request): New function. (file_editor::add_file_editor_tab): Connect fetab_delete_debugger_pointer signal to delete_debugger_pointer. (file_editor::fetab_insert_debugger_pointer): Rename from file_editor::fetab_set_debugger_position. Change all uses. (file_editor::fetab_delete_debugger_pointer): New signal. * main-window.h, main-window.cc (main_window::handle_insert_debugger_pointer_request): Rename from main_window::handle_update_debug_pointer_request. (main_window::handle_delete_debugger_pointer_request): New function. (main_window::construct): Connect delete_debugger_pointer_signal to handle_delete_debugger_pointer_request. * octave-event-listener.h (event_listener::insert_debugger_pointer): Rename from event_listener::update_debug_pointer): (event_listener::delete_debugger_pointer): New function * octave-link.h, octave-link.cc (octave_link::do_insert_debugger_pointer): Rename from octave_link::do_update_debug_pointer. Change all uses. (octave_link::do_delete_debugger_pointer): New function. (octave_link::do_enter_debugger_event_hook_fcn): Rename from octave_link::do_debug_input_event_hook_fcn. (octave_link::do_exit_debugger_event_hook_fcn): New function. (enter_debugger_event_hook_fcn): Rename form debug_input_event_hook_fcn. Change all uses. (octave_link::exit_debugger_event_hook_fcn): New function. * octave-main-thread.h, octave-main-thread.cc (enter_debugger_event_hook_fcn): Rename from debug_input_event_hook_fcn. (exit_debugger_event_hook_fcn): New function. (octave_main_thread::run): Install exit_debugger_event_hook_fcn hook function. * octave-qt-event-listener.h, octave-qt-event-listener.cc (octave_qt_event_listener::insert_debugger_pointer): Rename from octave_qt_event_listener::update_debug_pointer. Change all uses. (octave_qt_event_listener::delete_debugger_pointer): New function. * octave-qt-event-listener.h (octave_qt_event_listener::update_debug_pointer_signal): Rename from octave_qt_event_listener::insert_debugger_pointer_signal. Change all uses. (octave_qt_event_listner::delete_debugger_pointer_signal): New signal. * input.cc (enter_debugger_event_hook_functions): Rename from debug_input_event_hook_functions. Change all uses. (exit_debugger_event_hook_functions): New static variable. (exit_debugger_cleanup): new function. (get_debug_input): Use unwind-protect to run exit_debugger_event_hook_functions on return. (Fadd_enter_debugger_event_hook): Rename from Fadd_debug_input_event_hook. Change all uses. (Fremove_enter_debugger_event_hook): Rename from Fremove_debug_input_event_hook. Change all uses. (Fadd_exit_debugger_event_hook, Fremove_exit_debugger_event_hook): New functions.

--- a/libgui/src/octave-adapter/octave-link.h
+++ b/libgui/src/octave-adapter/octave-link.h
@@ -146,10 +146,16 @@
       instance->do_post_input_event_hook_fcn ();
   }
 
-  static void debug_input_event_hook_fcn (const octave_value_list& args)
+  static void enter_debugger_event_hook_fcn (const octave_value_list& args)
   {
     if (instance_ok ())
-      instance->do_debug_input_event_hook_fcn (args);
+      instance->do_enter_debugger_event_hook_fcn (args);
+  }
+
+  static void exit_debugger_event_hook_fcn (const octave_value_list& args)
+  {
+    if (instance_ok ())
+      instance->do_exit_debugger_event_hook_fcn (args);
   }
 
   static void
@@ -221,11 +227,13 @@
   std::string do_last_working_directory (void);
   void do_update_workspace (void);
   void do_update_history (void);
-  void do_update_debug_pointer (const octave_value_list& args);
+  void do_insert_debugger_pointer (const octave_value_list& args);
+  void do_delete_debugger_pointer (const octave_value_list& args);
 
   void do_pre_input_event_hook_fcn (void);
   void do_post_input_event_hook_fcn (void);
-  void do_debug_input_event_hook_fcn (const octave_value_list& args);
+  void do_enter_debugger_event_hook_fcn (const octave_value_list& args);
+  void do_exit_debugger_event_hook_fcn (const octave_value_list& args);
   void do_update_breakpoint_hook_fcn (bool insert,
                                       const octave_value_list& args);
 };