From 0007689cd0dd526df37c8f8c7f6b8cc2e9c04593 Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Thu, 8 May 2008 14:51:03 +0000 Subject: [PATCH] (cvs-bury-buffer): Revert my patch: quit-window appears to be too aggressive with window removal. --- lisp/ChangeLog | 5 +++++ lisp/pcvs-util.el | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2b966589a1..eee9c9b2d5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-05-07 Sam Steingold + + * pcvs-util.el (cvs-bury-buffer): Revert my patch: quit-window + appears to be too aggressive with window removal. + 2008-05-08 Michael McNamara * verilog-mode.el (verilog-type-font-keywords): Add leda and 0in diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el index 70b902522b..4973645453 100644 --- 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)))) -- 2.39.2