comparison src/window.c @ 1280:5c66007ecabb

* window.c (Fset_window_configuration): Don't select the frame just because we restored its configuration. * window.c (Fset_window_configuration): Don't forget to set the frame's selected window when we can't call Fselect_window.

1279:74ae34a80f94

	    }
	}
    }

  FRAME_ROOT_WINDOW (f) = data->root_window;

#ifdef MULTI_FRAME
  if (f != selected_frame && ! FRAME_TERMCAP_P (f))
    Fselect_frame (WINDOW_FRAME (XWINDOW (data->root_window)), Qnil);
#endif

  /* Set the screen height to the value it had before this function.  */
  if (frame_size_change)
    change_frame_size (f, previous_frame_height, previous_frame_width, 0, 0);

      if (!NILP (new_current_buffer))
	Fset_buffer (new_current_buffer);
      else
	Fset_buffer (XWINDOW (selected_window)->buffer);
    }

  Vminibuf_scroll_window = data->minibuf_scroll_window;
  return (Qnil);
}

1280:5c66007ecabb

	    }
	}
    }

  FRAME_ROOT_WINDOW (f) = data->root_window;
  /* We also need to restore the frame's selected window; that's taken
     care of below, either by calling Fselect_window, or by explicit
     assignment.  */

#if 0  /* I don't understand why this is needed, and it causes
	  problems when the frame's old selected window has been
	  deleted.  */
#ifdef MULTI_FRAME
  if (f != selected_frame && ! FRAME_TERMCAP_P (f))
    Fselect_frame (WINDOW_FRAME (XWINDOW (data->root_window)), Qnil);
#endif
#endif

  /* Set the screen height to the value it had before this function.  */
  if (frame_size_change)
    change_frame_size (f, previous_frame_height, previous_frame_width, 0, 0);

      if (!NILP (new_current_buffer))
	Fset_buffer (new_current_buffer);
      else
	Fset_buffer (XWINDOW (selected_window)->buffer);
    }
  else
    FRAME_SELECTED_WINDOW (f) = data->current_window;

  Vminibuf_scroll_window = data->minibuf_scroll_window;
  return (Qnil);
}