Commit 97f18cc8 authored by Jan Djärv's avatar Jan Djärv

* xfns.c (unwind_create_frame):

* nsfns.m (unwind_create_frame):
* w32fns.c (unwind_create_frame): Use Fmemq to check if frame is in
Vframe_list.

Fixes: debbugs:9999
parent 65bd19ff
2011-11-11 Jan Djärv <jan.h.d@swipnet.se>
* xfns.c (unwind_create_frame):
* nsfns.m (unwind_create_frame):
* w32fns.c (unwind_create_frame): Use Fmemq to check if frame is in
Vframe_list (Bug#9999).
2011-11-11 Dmitry Antipov <dmantipov@yandex.ru>
* xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
......
......@@ -1057,7 +1057,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
return Qnil;
/* If frame is ``official'', nothing to do. */
if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
if (NILP (Fmemq (frame, Vframe_list)))
{
#if GLYPH_DEBUG && XASSERTS
struct ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
......
......@@ -3986,7 +3986,7 @@ unwind_create_frame (Lisp_Object frame)
struct frame *f = XFRAME (frame);
/* If frame is ``official'', nothing to do. */
if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
if (NILP (Fmemq (frame, Vframe_list)))
{
#if GLYPH_DEBUG
struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f);
......
......@@ -2929,7 +2929,7 @@ unwind_create_frame (Lisp_Object frame)
return Qnil;
/* If frame is ``official'', nothing to do. */
if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
if (NILP (Fmemq (frame, Vframe_list)))
{
#if GLYPH_DEBUG && XASSERTS
struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
......
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