Commit c844a81a authored by Gerd Moellmann's avatar Gerd Moellmann

(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.
parent 10c2b5a8
......@@ -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
......
......@@ -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;
}
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment