From: Gerd Moellmann <gerd@gnu.org>
Date: Sun, 17 Dec 2000 15:10:18 +0000 (+0000)
Subject: (unwind_create_frame): Return t if frame was deleted.
X-Git-Tag: emacs-pretest-21.0.95~460
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c844a81af87170828e3b49c83b3518dcd5807364;p=emacs.git

(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 --git a/src/ChangeLog b/src/ChangeLog
index 132ffb077a6..2bf00546592 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,11 @@
 	(unwind_create_tip_frame): Set tip_frame to nil only if frame
 	was deleted.
 
+	* w32fns.c (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.
+
 2000-12-16  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* fileio.c (Fcopy_file): Rename the last argument to keep_time, to
diff --git a/src/w32fns.c b/src/w32fns.c
index 37aaf4238f1..c11f66b8a03 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5139,9 +5139,8 @@ unwind_create_frame (frame)
       /* 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 @@ static Lisp_Object
 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 --git a/src/xfns.c b/src/xfns.c
index 0def9ac3af5..ab4f288cb01 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4052,9 +4052,7 @@ unwind_create_frame (frame)
       /* 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 @@ static Lisp_Object
 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;
 }