[Emacs-diffs] /srv/bzr/emacs/trunk r106352: * xfns.c (unwind_create_frame):

[Jan D.]

------------------------------------------------------------
revno: 106352
fixes bug(s): http://debbugs.gnu.org/9999
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2011-11-11 19:33:30 +0100
message:
  * 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.
modified:
  src/ChangeLog
  src/nsfns.m
  src/w32fns.c
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-11 09:18:32 +0000
+++ b/src/ChangeLog     2011-11-11 18:33:30 +0000
@@ -1,3 +1,10 @@
+2011-11-11  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2011-11-05 12:25:01 +0000
+++ b/src/nsfns.m       2011-11-11 18:33:30 +0000
@@ -1057,7 +1057,7 @@
     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);

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2011-11-05 16:25:16 +0000
+++ b/src/w32fns.c      2011-11-11 18:33:30 +0000
@@ -3986,7 +3986,7 @@
   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);

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2011-11-05 12:04:34 +0000
+++ b/src/xfns.c        2011-11-11 18:33:30 +0000
@@ -2929,7 +2929,7 @@
     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);