* frame.c (Vdelete_frame_functions): New variable.

(syms_of_frame): Initialize and defvar it.
(Fdelete_frame): Use it instead of delete-frame-hook.  Don't run
it when frame's `tooltip' parameter is non-nil.

* xfns.c (x_create_tip_frame): Set `tooltip' frame parameter to t.

* w32fns.c (x_create_tip_frame): Likewise

* macfns.c (x_create_tip_frame): Likewise.

1 files changed, 14 insertions, 5 deletions

diff --git a/src/frame.c b/src/frame.c
index ffd0c5ade10..b8fb2e1546d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -80,6 +80,7 @@ Lisp_Object Vterminal_frame;
 Lisp_Object Vdefault_frame_alist;
 Lisp_Object Vmouse_position_function;
 Lisp_Object Vmouse_highlight;
+Lisp_Object Vdelete_frame_functions;
 
 static void
 set_menu_bar_lines_1 (window, n)
@@ -1092,8 +1093,9 @@ A frame may not be deleted if its minibuffer is used by other frames.
 Normally, you may not delete a frame if all other frames are invisible,
 but if the second optional argument FORCE is non-nil, you may do so.
 
-This function runs `delete-frame-hook' before actually deleting the
-frame.  The hook is called with one argument FRAME.  */)
+This function runs `delete-frame-functions' before actually deleting the
+frame, unless the frame is a tooltip.
+The functions are run with one arg, the frame to be deleted.  */)
      (frame, force)
      Lisp_Object frame, force;
 {
@@ -1152,11 +1154,12 @@ frame.  The hook is called with one argument FRAME.  */)
         }
     }
 
-  /* Run `delete-frame-hook'.  */
-  if (!NILP (Vrun_hooks))
+  /* Run `delete-frame-functions' unless frame is a tooltip.  */
+  if (!NILP (Vrun_hooks)
+      && NILP (Fframe_parameter (frame, intern ("tooltip"))))
     {
       Lisp_Object args[2];
-      args[0] = intern ("delete-frame-hook");
+      args[0] = intern ("delete-frame-functions");
       args[1] = frame;
       Frun_hook_with_args (2, args);
     }
@@ -2529,6 +2532,12 @@ is over the clickable text.  However, the mouse shape still indicates
 when the mouse is over clickable text.  */);
   Vmouse_highlight = Qt;
 
+  DEFVAR_LISP ("delete-frame-functions", &Vdelete_frame_functions,
+               doc: /* Functions to be run before deleting a frame.
+The functions are run with one arg, the frame to be deleted.
+See `delete-frame'.  */);
+  Vdelete_frame_functions = Qnil;
+
   DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame,
                  doc: /* Minibufferless frames use this frame's minibuffer.