summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2016-08-25 10:53:27 +0200
committerMartin Rudalics <rudalics@gmx.at>2016-08-25 10:53:27 +0200
commit63415a53c7ad31d51295c25423a9151b6737d6be (patch)
treee916cc1edcc609491c332e2ddcfdaaf54cbf492f /lisp
parent70cfe9df957bd2f0699f62fe5e69176313f7c8f0 (diff)
Some fixes around `delete-other-frames' and `next-frame'
* src/frame.c (Fdelete_frame): Clarify doc-string. * lisp/frame.el (delete-other-frames): Delete other frames on FRAME's terminal instead of the current terminal. Delete non-minibuffer-only surrogate frames too. See http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00467.html * doc/lispref/frames.texi (Deleting Frames): Minor fixes for docs of `delete-frame' and `frame-live-p'. Add entry for `delete-other-frames'. (Finding All Frames): Fix doc of `next-frame'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/frame.el41
1 files changed, 20 insertions, 21 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 09738d1e2e..cfd40bf22f 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1874,30 +1874,29 @@ In the 3rd, 4th, and 6th examples, the returned value is relative to
the opposite frame edge from the edge indicated in the input spec."
(cons (car spec) (frame-geom-value-cons (car spec) (cdr spec) frame)))
-
(defun delete-other-frames (&optional frame)
- "Delete all frames on the current terminal, except FRAME.
+ "Delete all frames on FRAME's terminal, except FRAME.
If FRAME uses another frame's minibuffer, the minibuffer frame is
-left untouched. FRAME nil or omitted means use the selected frame."
+left untouched. FRAME must be a live frame and defaults to the
+selected one."
(interactive)
- (unless frame
- (setq frame (selected-frame)))
- (let* ((mini-frame (window-frame (minibuffer-window frame)))
- (frames (delq mini-frame (delq frame (frame-list)))))
- ;; Only consider frames on the same terminal.
- (dolist (frame (prog1 frames (setq frames nil)))
- (if (eq (frame-terminal) (frame-terminal frame))
- (push frame frames)))
- ;; Delete mon-minibuffer-only frames first, because `delete-frame'
- ;; signals an error when trying to delete a mini-frame that's
- ;; still in use by another frame.
- (dolist (frame frames)
- (unless (eq (frame-parameter frame 'minibuffer) 'only)
- (delete-frame frame)))
- ;; Delete minibuffer-only frames.
- (dolist (frame frames)
- (when (eq (frame-parameter frame 'minibuffer) 'only)
- (delete-frame frame)))))
+ (setq frame (window-normalize-frame frame))
+ (let ((minibuffer-frame (window-frame (minibuffer-window frame)))
+ (this (next-frame frame t))
+ next)
+ ;; In a first round consider minibuffer-less frames only.
+ (while (not (eq this frame))
+ (setq next (next-frame this t))
+ (unless (eq (window-frame (minibuffer-window this)) this)
+ (delete-frame this))
+ (setq this next))
+ ;; In a second round consider all remaining frames.
+ (setq this (next-frame frame t))
+ (while (not (eq this frame))
+ (setq next (next-frame this t))
+ (unless (eq this minibuffer-frame)
+ (delete-frame this))
+ (setq this next))))
;; miscellaneous obsolescence declarations
(define-obsolete-variable-alias 'delete-frame-hook