diff options
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/gnus-win.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9d9a86ca406..0923ed4db96 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-06-18 Nelson Ferreira <nelson.ferreira@ieee.org> (tiny change) | ||
| 2 | |||
| 3 | * gnus-win.el (gnus-configure-frame): Pass an arg to window-dedicated-p. | ||
| 4 | |||
| 1 | 2012-06-17 Toke Høiland-Jørgensen <toke@toke.dk> (tiny change) | 5 | 2012-06-17 Toke Høiland-Jørgensen <toke@toke.dk> (tiny change) |
| 2 | 6 | ||
| 3 | * nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time' | 7 | * nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time' |
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el index efe2a319854..bd9ea10fdc4 100644 --- a/lisp/gnus/gnus-win.el +++ b/lisp/gnus/gnus-win.el | |||
| @@ -273,7 +273,9 @@ See the Gnus manual for an explanation of the syntax used.") | |||
| 273 | (cond | 273 | (cond |
| 274 | ((eq buf (window-buffer (selected-window))) | 274 | ((eq buf (window-buffer (selected-window))) |
| 275 | (set-buffer buf)) | 275 | (set-buffer buf)) |
| 276 | ((eq t (window-dedicated-p)) | 276 | ((eq t (window-dedicated-p |
| 277 | ;; XEmacs version of `window-dedicated-p' requires it. | ||
| 278 | (selected-window))) | ||
| 277 | ;; If the window is hard-dedicated, we have a problem because | 279 | ;; If the window is hard-dedicated, we have a problem because |
| 278 | ;; we just can't do what we're asked. But signaling an error, | 280 | ;; we just can't do what we're asked. But signaling an error, |
| 279 | ;; like `switch-to-buffer' would do, is not an option because | 281 | ;; like `switch-to-buffer' would do, is not an option because |