[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/pcvs-util.el,v
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/pcvs-util.el,v |
Date: |
Thu, 17 Apr 2008 13:44:01 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Sam Steingold <sds> 08/04/17 13:44:00
Index: pcvs-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcvs-util.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- pcvs-util.el 7 Apr 2008 14:25:01 -0000 1.37
+++ pcvs-util.el 17 Apr 2008 13:44:00 -0000 1.38
@@ -102,20 +102,7 @@
(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))))