* frame.c (delete_frame): New function derived from

Fdelete_frame to handle Qnoelisp value for FORCE argument.
Delete last frame iff FORCE equals Qnoelisp.  (Bug#1450)
(Fdelete_frame): Call delete_frame.  Remove line from doc-string
saying that FORCE non-nil doesn't run `delete-frame-functions'.
* frame.h: Extern delete_frame.
* window.c (window_loop):
* terminal.c (delete_terminal):
* xterm.c (x_connection_closed):
* xfns.c (Fx_hide_tip):
* w32fns.c (Fx_hide_tip): Call delete_frame instead of
Fdelete_frame.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/window.c b/src/window.c
index c74b163cb9f..81fb70a17fd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2273,7 +2273,7 @@ window_loop (type, obj, mini, frames)
                       windows = XCDR (windows);
 
                     /* Now we can safely delete the frame.  */
-                    Fdelete_frame (w->frame, Qnil);
+                    delete_frame (w->frame, Qnil);
                   }
                 else if (NILP (w->parent))
                   {
@@ -2334,7 +2334,7 @@ window_loop (type, obj, mini, frames)
                       windows = XCDR (windows);
 
                     /* Now we can safely delete the frame.  */
-                    Fdelete_frame (w->frame, Qnil);
+                    delete_frame (w->frame, Qnil);
                   }
                 else if (!NILP (w->dedicated) && !NILP (w->parent))
                   {
@@ -6909,7 +6909,7 @@ foreach_window (f, fn, user_data)
      int (* fn) P_ ((struct window *, void *));
      void *user_data;
 {
-  /* Fdelete_frame may set FRAME_ROOT_WINDOW (f) to Qnil.  */
+  /* delete_frame may set FRAME_ROOT_WINDOW (f) to Qnil.  */
   if (WINDOWP (FRAME_ROOT_WINDOW (f)))
     foreach_window_1 (XWINDOW (FRAME_ROOT_WINDOW (f)), fn, user_data);
 }