From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 18 May 1994 23:37:55 +0000 (+0000)
Subject: (Fset_window_buffer): Fix dedicated window error call.
X-Git-Tag: emacs-19.34~8308
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3cf855321c7d3a36aa2f292868dff65dc19becf6;p=emacs.git

(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 ce0b05339ee..8fa6472057a 100644
--- 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);
     }