(cvs-bury-buffer): Revert my patch: quit-window

appears to be too aggressive with window removal.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b966589a178044f52cfb41e522d5fb1d541fe66..eee9c9b2d5a3db7dbc7794cd12d5a827248afd43 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-07  Sam Steingold  <sds@gnu.org>
+
+       * pcvs-util.el (cvs-bury-buffer): Revert my patch: quit-window
+       appears to be too aggressive with window removal.
+
 2008-05-08  Michael McNamara  <mac@mail.brushroad.com>
 
        * verilog-mode.el (verilog-type-font-keywords): Add leda and 0in

diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 70b902522bc5bef6cc5190da6841b81c3adda335..4973645453693824c41fa1502ccd8fd9d9631242 100644 (file)
--- 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))))