aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2004-10-16 15:35:11 +0000
committerRichard M. Stallman2004-10-16 15:35:11 +0000
commit931a33313e9d66037eb9ea50e854fe7028c0a8fe (patch)
tree6a422305f3f84ec23c03bcdd9ff696d04eb1d38a
parent6e32922db2eb001674aea51b4dd1ce59efe8a74d (diff)
downloademacs-931a33313e9d66037eb9ea50e854fe7028c0a8fe.tar.gz
emacs-931a33313e9d66037eb9ea50e854fe7028c0a8fe.zip
(cvs-bury-buffer): Don't call get-buffer-window for effect.
-rw-r--r--lisp/pcvs-util.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 5d9d0d215af..a4eda95e23e 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -104,11 +104,12 @@ BUF is assumed to be a temporary buffer used from the buffer MAINBUF."
104 (condition-case () 104 (condition-case ()
105 (delete-window win) 105 (delete-window win)
106 (error (iconify-frame (window-frame win)))) 106 (error (iconify-frame (window-frame win))))
107 (if (and mainbuf (get-buffer-window mainbuf)) 107;;; (if (and mainbuf (get-buffer-window mainbuf))
108 ;; FIXME: if the buffer popped into a pre-existing window, 108;;; ;; FIXME: if the buffer popped into a pre-existing window,
109 ;; we don't want to delete that window. 109;;; ;; we don't want to delete that window.
110 t ;;(delete-window win) 110;;; t ;;(delete-window win)
111 )))) 111;;; )
112 )))
112 (with-current-buffer buf 113 (with-current-buffer buf
113 (bury-buffer (unless (and (eq buf (window-buffer (selected-window))) 114 (bury-buffer (unless (and (eq buf (window-buffer (selected-window)))
114 (not (window-dedicated-p (selected-window)))) 115 (not (window-dedicated-p (selected-window))))