# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 977065792 0
# Node ID abb4510a89f6d4409b5f90439106e9c41459b761
# Parent  5643f5752cc08cbdfa87a79a65cde3cb1ff3e433
(unwind_create_frame): Return t if frame was deleted.
Don't alter tip_frame or tip_window.
(unwind_create_tip_frame): Set tip_frame to nil only if frame
was deleted.

diff -r 5643f5752cc0 -r abb4510a89f6 src/w32fns.c
--- a/src/w32fns.c	Sun Dec 17 15:07:38 2000 +0000
+++ b/src/w32fns.c	Sun Dec 17 15:09:52 2000 +0000
@@ -5139,9 +5139,8 @@
       /* Check that reference counts are indeed correct.  */
       xassert (dpyinfo->reference_count == dpyinfo_refcount);
       xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
-  
-      tip_window = NULL;
-      tip_frame = Qnil;
+
+      return Qt;
     }
   
   return Qnil;
@@ -12227,9 +12226,16 @@
 unwind_create_tip_frame (frame)
      Lisp_Object frame;
 {
-  tip_window = NULL;
-  tip_frame = Qnil;
-  return unwind_create_frame (frame);
+  Lisp_Object deleted;
+
+  deleted = unwind_create_frame (frame);
+  if (EQ (deleted, Qt))
+    {
+      tip_window = NULL;
+      tip_frame = Qnil;
+    }
+  
+  return deleted;
 }
 
 
diff -r 5643f5752cc0 -r abb4510a89f6 src/xfns.c
--- a/src/xfns.c	Sun Dec 17 15:07:38 2000 +0000
+++ b/src/xfns.c	Sun Dec 17 15:09:52 2000 +0000
@@ -4052,9 +4052,7 @@
       /* Check that reference counts are indeed correct.  */
       xassert (dpyinfo->reference_count == dpyinfo_refcount);
       xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
-  
-      tip_window = None;
-      tip_frame = Qnil;
+      return Qt;
     }
   
   return Qnil;
@@ -10357,9 +10355,16 @@
 unwind_create_tip_frame (frame)
      Lisp_Object frame;
 {
-  tip_window = None;
-  tip_frame = Qnil;
-  return unwind_create_frame (frame);
+  Lisp_Object deleted;
+
+  deleted = unwind_create_frame (frame);
+  if (EQ (deleted, Qt))
+    {
+      tip_window = None;
+      tip_frame = Qnil;
+    }
+  
+  return deleted;
 }