From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 27 Mar 2010 16:17:24 +0000 (+0100)
Subject: Don't delete windows on old frame in case of C-x 5 2.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff34e10330ad1c86a7c7ff0f5c4b283e6166095e;p=emacs.git

Don't delete windows on old frame in case of C-x 5 2.
---

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 3fe05e2d129..998ab6eb621 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -819,7 +819,8 @@ xg_switch_page_cb (GtkNotebook     *wnote,
   BLOCK_INPUT;
   GtkWidget *w = gtk_notebook_get_nth_page (wnote, page_num);
   FRAME_PTR f = (FRAME_PTR) user_data;
-  if (w != FRAME_GTK_WIDGET (f)) 
+
+  if (FRAME_GTK_WIDGET (f) && w != FRAME_GTK_WIDGET (f)) 
     {
       GtkWidget *old = FRAME_GTK_WIDGET (f);
       GList *children = old ? GTK_FIXED (old)->children : NULL;
@@ -885,7 +886,7 @@ xg_switch_page_cb (GtkNotebook     *wnote,
 
       if (conf)
         Fset_window_configuration (conf->object);
-      else
+      else 
         Fdelete_other_windows (Qnil);
     }
   xg_check_show_tabs (f, wnote);