diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/nsfns.m | 2 | ||||
| -rw-r--r-- | src/w32fns.c | 2 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fc1859a0ca5..049c2399caa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +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. diff --git a/src/nsfns.m b/src/nsfns.m index 23362433a39..20b021c6f5d 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1057,7 +1057,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 ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); diff --git a/src/w32fns.c b/src/w32fns.c index 6f32442514a..ffbcff86694 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -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); diff --git a/src/xfns.c b/src/xfns.c index 49c4c774cae..2359a1a82c2 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -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); |