Mercurial > emacs

changeset 34638:abb4510a89f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Gerd Moellmann <gerd@gnu.org>
date Sun, 17 Dec 2000 15:09:52 +0000
parents 5643f5752cc0
children 911e673ddc04
files src/w32fns.c src/xfns.c
diffstat 2 files changed, 23 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }
 
 
--- 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;
 }