diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/frame.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index cec262499d1..05db8cf6fd4 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -118,13 +118,10 @@ appended when the minibuffer frame is created." | |||
| 118 | (let* ((frame (posn-window (event-start event)))) | 118 | (let* ((frame (posn-window (event-start event)))) |
| 119 | (if (catch 'other-frame | 119 | (if (catch 'other-frame |
| 120 | (dolist (frame-1 (frame-list)) | 120 | (dolist (frame-1 (frame-list)) |
| 121 | ;; A valid "other" frame is visible, owns its minibuffer | 121 | ;; A valid "other" frame is visible, has its `delete-before' |
| 122 | ;; window, has its `delete-before' parameter unset and is | 122 | ;; parameter unset and is not a child frame. |
| 123 | ;; not a child frame. | ||
| 124 | (when (and (not (eq frame-1 frame)) | 123 | (when (and (not (eq frame-1 frame)) |
| 125 | (frame-visible-p frame-1) | 124 | (frame-visible-p frame-1) |
| 126 | (window-live-p (minibuffer-window frame-1)) | ||
| 127 | (eq (window-frame (minibuffer-window frame-1)) frame-1) | ||
| 128 | (not (frame-parent frame-1)) | 125 | (not (frame-parent frame-1)) |
| 129 | (not (frame-parameter frame-1 'delete-before))) | 126 | (not (frame-parameter frame-1 'delete-before))) |
| 130 | (throw 'other-frame t)))) | 127 | (throw 'other-frame t)))) |