diff options
| author | Sam Steingold <sds@gnu.org> | 2008-04-17 13:44:00 +0000 |
|---|---|---|
| committer | Sam Steingold <sds@gnu.org> | 2008-04-17 13:44:00 +0000 |
| commit | e2b58a40cfdefa153c3be6c7fcf41de9d1e1e61e (patch) | |
| tree | c85a2fcee2d87500839e863cef0d15b1b4a2949d /lisp/pcvs-util.el | |
| parent | e499351ad25105378726415309ed22ce55f4b9e4 (diff) | |
| download | emacs-e2b58a40cfdefa153c3be6c7fcf41de9d1e1e61e.tar.gz emacs-e2b58a40cfdefa153c3be6c7fcf41de9d1e1e61e.tar.bz2 emacs-e2b58a40cfdefa153c3be6c7fcf41de9d1e1e61e.zip | |
(cvs-bury-buffer): Use quit-window instead of the
idiosyncratic bury-buffer/delete-window logic.
Diffstat (limited to 'lisp/pcvs-util.el')
| -rw-r--r-- | lisp/pcvs-util.el | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el index 1cbe72796c2..21d668d134f 100644 --- a/lisp/pcvs-util.el +++ b/lisp/pcvs-util.el @@ -102,20 +102,7 @@ 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 - (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))) + (quit-window nil win))) (when mainbuf (let ((mainwin (or (get-buffer-window mainbuf) (get-buffer-window mainbuf 'visible)))) |