procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(cvs-bury-buffer): Use quit-window instead of the

Browse source 
idiosyncratic bury-buffer/delete-window logic.
This commit is contained in:
Sam Steingold 2008-04-17 13:44:00 +00:00
parent e499351ad2
commit e2b58a40cf
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2008-04-17 Sam Steingold <sds@gnu.org>
* pcvs-util.el (cvs-bury-buffer): Use quit-window instead of the
idiosyncratic bury-buffer/delete-window logic.
2008-04-17 Juanma Barranquero <lekktu@gmail.com>
* emacs-lisp/crm.el (crm-completion-help, crm-complete)

15
lisp/pcvs-util.el
View file

@ -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))))