]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't delete windows on old frame in case of C-x 5 2.
authorJan Djärv <jan.h.d@swipnet.se>
Sat, 27 Mar 2010 16:17:24 +0000 (17:17 +0100)
committerJan Djärv <jan.h.d@swipnet.se>
Sat, 27 Mar 2010 16:17:24 +0000 (17:17 +0100)
src/gtkutil.c

index 3fe05e2d129cc666d4aee9e2f848529594358746..998ab6eb621be6b90995a46c3c065b485b4bab8b 100644 (file)
@@ -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);