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

* lisp/window.el (window-deletable-p): Use next-frame.

Browse source
This commit is contained in:
Chong Yidong 2011-09-13 15:10:32 -04:00
parent 1b36ed6a22
commit 85e9c04bf3
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2011-09-13 Chong Yidong <cyd@stupidchicken.com>
* window.el (window-deletable-p): Use next-frame.
2011-09-13 Martin Rudalics <rudalics@gmx.at>
* window.el (window-auto-delete): Remove.

13
lisp/window.el
View file

@ -2274,15 +2274,10 @@ frame."
(buffer (window-buffer window)))
(cond
((frame-root-window-p window)
;; WINDOW's frame can be deleted only if there are other visible
;; frames on the same terminal.
(when (let ((terminal (frame-terminal frame)))
(catch 'found
(dolist (f (delq frame (frame-list)))
(and (eq terminal (frame-terminal f))
(frame-visible-p f)
(throw 'found t)))))
'frame))
;; WINDOW's frame can be deleted only if there are other frames
;; on the same terminal.
(unless (eq frame (next-frame frame 0))
'frame))
((or ignore-window-parameters
(not (eq (window-parameter window 'window-side) 'none))
(and parent (eq (window-parameter parent 'window-side) 'none)))