diff options
| author | Gnus developers <ding@gnus.org> | 2011-10-06 22:11:15 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-10-06 22:11:15 +0000 |
| commit | 465d0300d4ffdaf2d816f79f76716ba3406ac869 (patch) | |
| tree | 5810cfd93a08bc315391ffb9eda6a12c20fc462f /lisp/gnus/gnus-win.el | |
| parent | 0181e1939ea39ceaf54e4cfd95858a5fcfb4f0c7 (diff) | |
| download | emacs-465d0300d4ffdaf2d816f79f76716ba3406ac869.tar.gz | |
Merge changes made in Gnus trunk.
gnus.texi (Gnus Utility Functions): Add more references and explanations (bug#9683).
ecomplete.el (ecomplete-display-matches): Use a local keymap to handle bindings.
gnus-win.el (gnus-configure-windows): Protect against reading ephemeral groups outside of Gnus.
Diffstat (limited to 'lisp/gnus/gnus-win.el')
| -rw-r--r-- | lisp/gnus/gnus-win.el | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el index c38f57d96cb..a1a8abc3086 100644 --- a/lisp/gnus/gnus-win.el +++ b/lisp/gnus/gnus-win.el @@ -358,8 +358,13 @@ See the Gnus manual for an explanation of the syntax used.") (defvar gnus-frame-split-p nil) (defun gnus-configure-windows (setting &optional force) - (if (window-configuration-p setting) - (set-window-configuration setting) + (cond + ((null setting) + ;; Do nothing. + ) + ((window-configuration-p setting) + (set-window-configuration setting)) + (t (setq gnus-current-window-configuration setting) (setq force (or force gnus-always-force-window-configuration)) (let ((split (if (symbolp setting) @@ -410,7 +415,7 @@ See the Gnus manual for an explanation of the syntax used.") (run-hooks 'gnus-configure-windows-hook) (when gnus-window-frame-focus (gnus-select-frame-set-input-focus - (window-frame gnus-window-frame-focus)))))))) + (window-frame gnus-window-frame-focus))))))))) (defun gnus-delete-windows-in-gnusey-frames () "Do a `delete-other-windows' in all frames that have Gnus windows." |