diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-10-26 04:13:46 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-10-26 04:13:46 +0000 |
| commit | f5385255de06994bfc8217a9e8612af9cc45d795 (patch) | |
| tree | f8b663d94773b16a109046cc16f3b59ffc466b09 /src/window.c | |
| parent | b6576049821dc2adeb8c5c25ca6a059101443563 (diff) | |
| download | emacs-f5385255de06994bfc8217a9e8612af9cc45d795.tar.gz | |
(Fset_window_buffer): Undo 2008-10-18 change to re-instate
the distinction between non-nil and non-t value of `dedicated'.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 5931955fd66..737eeed3f35 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); } |