diff options
| author | Sam Steingold <sds@gnu.org> | 2008-05-08 14:51:03 +0000 |
|---|---|---|
| committer | Sam Steingold <sds@gnu.org> | 2008-05-08 14:51:03 +0000 |
| commit | 0007689cd0dd526df37c8f8c7f6b8cc2e9c04593 (patch) | |
| tree | 5465ac8f0991c55f3a61bdf476ce70ac27529a7a /lisp/pcvs-util.el | |
| parent | efcb74f6270716aec2fa769a01369b8787b49587 (diff) | |
| download | emacs-0007689cd0dd526df37c8f8c7f6b8cc2e9c04593.tar.gz | |
(cvs-bury-buffer): Revert my patch: quit-window
appears to be too aggressive with window removal.
Diffstat (limited to 'lisp/pcvs-util.el')
| -rw-r--r-- | lisp/pcvs-util.el | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el index 70b902522bc..49736454536 100644 --- a/lisp/pcvs-util.el +++ b/lisp/pcvs-util.el @@ -100,7 +100,20 @@ BUF is assumed to be a temporary buffer used from the buffer MAINBUF." (let ((win (if (eq buf (window-buffer (selected-window))) (selected-window) (get-buffer-window buf t)))) (when win - (quit-window nil win))) + (if (window-dedicated-p win) + (condition-case () + (delete-window win) + (error (iconify-frame (window-frame win)))) +;;; (if (and mainbuf (get-buffer-window mainbuf)) +;;; ;; FIXME: if the buffer popped into a pre-existing window, +;;; ;; we don't want to delete that window. +;;; t ;;(delete-window win) +;;; ) + ))) + (with-current-buffer buf + (bury-buffer (unless (and (eq buf (window-buffer (selected-window))) + (not (window-dedicated-p (selected-window)))) + buf))) (when mainbuf (let ((mainwin (or (get-buffer-window mainbuf) (get-buffer-window mainbuf 'visible)))) |