comparison src/window.c @ 1237:3929b2135e58

* window.c (delete_all_subwindows): Save the window's buffer in its `height' field; we may need to know the window's old buffer once we have restored it from a window configuration. Fset_window_configuration): When we restore a window, if its `height' field is a buffer, restore its `buffer' field from that. This allows us to leave the window's buffer unchanged if the buffer recorded in the configuration is dead. * window.c (delete_all_subwindows): Removed unused variable named "count".

1236:5e8c234e5f03

  windows_or_buffers_changed++;
  new_current_buffer = data->current_buffer;
  if (NILP (XBUFFER (new_current_buffer)->name))
    new_current_buffer = Qnil;

  /* Mark all windows now on frame as "deleted".
     Restoring the new configuration "undeletes" any that are in it.  */
  delete_all_subwindows (XWINDOW (FRAME_ROOT_WINDOW (f)));

  for (k = 0; k < saved_windows->size; k++)
    {
      p = SAVED_WINDOW_N (saved_windows, k);

		  XWINDOW (w->parent)->hchild = p->window;
		  XWINDOW (w->parent)->vchild = Qnil;
		}
	    }
	}
      w->left = p->left;
      w->top = p->top;
      w->width = p->width;
      w->height = p->height;
      w->hscroll = p->hscroll;

static void
delete_all_subwindows (w)
     register struct window *w;
{
  register int count = 1;
  w->buffer = Qnil;
  if (!NILP (w->next))
    delete_all_subwindows (XWINDOW (w->next));
  if (!NILP (w->vchild))
    delete_all_subwindows (XWINDOW (w->vchild));

1237:3929b2135e58

  windows_or_buffers_changed++;
  new_current_buffer = data->current_buffer;
  if (NILP (XBUFFER (new_current_buffer)->name))
    new_current_buffer = Qnil;

  /* Kludge Alert!
     Mark all windows now on frame as "deleted".
     Restoring the new configuration "undeletes" any that are in it.

     Save their current buffers in their height fields, since we may
     need it later, if the buffer saved in the configuration is now
     dead.  */
  delete_all_subwindows (XWINDOW (FRAME_ROOT_WINDOW (f)));

  for (k = 0; k < saved_windows->size; k++)
    {
      p = SAVED_WINDOW_N (saved_windows, k);

		  XWINDOW (w->parent)->hchild = p->window;
		  XWINDOW (w->parent)->vchild = Qnil;
		}
	    }
	}

      /* If we squirreled away the buffer in the window's height,
	 restore it now.  */
      if (XTYPE (w->height) == Lisp_Buffer)
	w->buffer = w->height;
      w->left = p->left;
      w->top = p->top;
      w->width = p->width;
      w->height = p->height;
      w->hscroll = p->hscroll;

static void
delete_all_subwindows (w)
     register struct window *w;
{
  w->height = w->buffer;       /* See Fset_window_configuration for excuse.  */
  w->buffer = Qnil;
  if (!NILP (w->next))
    delete_all_subwindows (XWINDOW (w->next));
  if (!NILP (w->vchild))
    delete_all_subwindows (XWINDOW (w->vchild));