(Fset_window_buffer): Undo 2008-10-18 change to re-instate

the distinction between non-nil and non-t value of `dedicated'.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/window.c b/src/window.c
index 5931955fd6..737eeed3f3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3522,8 +3522,11 @@ This function runs the hook `window-scroll-functions'.  */)
   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));
+      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);
     }