(Fset_window_buffer): Fix dedicated window error call.

(window_loop, case UNSHOW_BUFFER): Clear dedicated flag.

diff --git a/src/window.c b/src/window.c
index ce0b05339ee7c62ffa4d6fe62848eca54a47ee0a..8fa6472057a53835b8ca37e2a6b7d2f4dcf84f0d 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1269,6 +1269,7 @@ window_loop (type, obj, mini, frames)
                if (NILP (another_buffer))
                  another_buffer
                    = Fget_buffer_create (build_string ("*scratch*"));
+               XWINDOW (w)->dedicated = Qnil;
                Fset_window_buffer (w, another_buffer);
                if (EQ (w, selected_window))
                  Fset_buffer (XWINDOW (w)->buffer);
@@ -1626,7 +1627,8 @@ BUFFER can be a buffer or buffer name.")
                                   is first being set up.  */
     {
       if (!NILP (w->dedicated) && !EQ (tem, buffer))
-       error ("Window is dedicated to %s\n", tem);
+       error ("Window is dedicated to `%s'",
+              XSTRING (XBUFFER (tem)->name)->data);
 
       unshow_buffer (w);
     }