comparison src/window.c @ 83286:9deb6323655c

Merged from [e-mail]--gnu-2005 (patch 59, 240-245) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-240 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-241 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-242 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-243 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-244 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-245 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-59 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-326

83285:865f9b91fdbe

  ++window_select_count;
  XSETFASTINT (w->use_time, window_select_count);
  if (EQ (window, selected_window))
    return window;

  if (!NILP (selected_window))
    {
      ow = XWINDOW (selected_window);
      if (! NILP (ow->buffer))
	set_marker_both (ow->pointm, ow->buffer,

	  != previous_frame_tool_bar_lines)
	x_set_tool_bar_lines (f, data->frame_tool_bar_lines, make_number (0));
#endif
#endif

      /* "Swap out" point from the selected window
	 into its buffer.  We do this now, before
	 restoring the window contents, and prevent it from
	 being done later on when we select a new window.  */
      if (! NILP (XWINDOW (selected_window)->buffer))
	{
	  w = XWINDOW (selected_window);

	}

      FRAME_ROOT_WINDOW (f) = data->root_window;
      /* Prevent "swapping out point" in the old selected window
	 using the buffer that has been restored into it.
	 Use the point value from the beginning of this function
	 since unshow_buffer (called from delete_all_subwindows)
	 could have altered it.  */
      selected_window = Qnil;
      if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer))
	set_marker_restricted (XWINDOW (data->current_window)->pointm,
			       make_number (old_point),
			       XWINDOW (data->current_window)->buffer);

83286:9deb6323655c

  ++window_select_count;
  XSETFASTINT (w->use_time, window_select_count);
  if (EQ (window, selected_window))
    return window;

  /* Store the current buffer's actual point into the
     old selected window.  It belongs to that window,
     and when the window is not selected, must be in the window.  */
  if (!NILP (selected_window))
    {
      ow = XWINDOW (selected_window);
      if (! NILP (ow->buffer))
	set_marker_both (ow->pointm, ow->buffer,

	  != previous_frame_tool_bar_lines)
	x_set_tool_bar_lines (f, data->frame_tool_bar_lines, make_number (0));
#endif
#endif

      /* "Swap out" point from the selected window's buffer
	 into the window itself.  (Normally the pointm of the selected
	 window holds garbage.)  We do this now, before
	 restoring the window contents, and prevent it from
	 being done later on when we select a new window.  */
      if (! NILP (XWINDOW (selected_window)->buffer))
	{
	  w = XWINDOW (selected_window);

	}

      FRAME_ROOT_WINDOW (f) = data->root_window;
      /* Prevent "swapping out point" in the old selected window
	 using the buffer that has been restored into it.
	 We already swapped out point that from that window's old buffer.  */
      selected_window = Qnil;

      /* Arrange *not* to restore point in the buffer that was
	 current when the window configuration was saved.  */
      if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer))
	set_marker_restricted (XWINDOW (data->current_window)->pointm,
			       make_number (old_point),
			       XWINDOW (data->current_window)->buffer);