comparison src/window.c @ 99142:ed258613edc7

(Fset_window_buffer): Undo 2008-10-18 change to re-instate the distinction between non-nil and non-t value of `dedicated'.

99141:e85076badf75

  if (NILP (tem))
    error ("Window is deleted");
  else if (!EQ (tem, Qt))
    /* w->buffer is t when the window is first being set up.  */
    {
      if (!NILP (w->dedicated) && !EQ (tem, buffer))
	error ("Window is dedicated to `%s'", SDATA (XBUFFER (tem)->name));

      unshow_buffer (w);
    }

  set_window_buffer (window, buffer, 1, !NILP (keep_margins));

99142:ed258613edc7

  if (NILP (tem))
    error ("Window is deleted");
  else if (!EQ (tem, Qt))
    /* w->buffer is t when the window is first being set up.  */
    {
      if (!EQ (tem, buffer))
	if (EQ (w->dedicated, Qt))
	  error ("Window is dedicated to `%s'", SDATA (XBUFFER (tem)->name));
	else
	  w->dedicated = Qnil;

      unshow_buffer (w);
    }

  set_window_buffer (window, buffer, 1, !NILP (keep_margins));