[Emacs-diffs] Changes to emacs/lisp/pcvs-util.el,v

[Sam Steingold]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Sam Steingold <sds>     08/05/08 14:51:03

Index: pcvs-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcvs-util.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- pcvs-util.el        6 May 2008 07:57:46 -0000       1.39
+++ pcvs-util.el        8 May 2008 14:51:03 -0000       1.40
@@ -100,7 +100,20 @@
     (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))))