[Emacs-diffs] Changes to emacs/src/window.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/10/26 04:13:48

Index: window.c
===================================================================
RCS file: /sources/emacs/emacs/src/window.c,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -b -r1.627 -r1.628
--- window.c    25 Oct 2008 07:57:07 -0000      1.627
+++ window.c    26 Oct 2008 04:13:47 -0000      1.628
@@ -3522,8 +3522,11 @@
   else if (!EQ (tem, Qt))
     /* w->buffer is t when the window is first being set up.  */
     {
-      if (!NILP (w->dedicated) && !EQ (tem, buffer))
+      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);
     }