From e2b58a40cfdefa153c3be6c7fcf41de9d1e1e61e Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Thu, 17 Apr 2008 13:44:00 +0000 Subject: [PATCH] (cvs-bury-buffer): Use quit-window instead of the idiosyncratic bury-buffer/delete-window logic. --- lisp/ChangeLog | 5 +++++ lisp/pcvs-util.el | 15 +-------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 278ae3677cb..09c00ee2c89 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-04-17 Sam Steingold + + * pcvs-util.el (cvs-bury-buffer): Use quit-window instead of the + idiosyncratic bury-buffer/delete-window logic. + 2008-04-17 Juanma Barranquero * emacs-lisp/crm.el (crm-completion-help, crm-complete) 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)))) -- 2.39.2