Fix 'message' when there's active minibuffer on another frame

* lisp/minibuffer.el (set-minibuffer-message): Don't reuse the
active minibuffer for displaying messages unless the active
minibuffer is on the same frame as the selected window.

Copyright-paperwork-exempt: yes

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index f6e2b236f3eb1b1fe24132ad8779832f0170de3d..10cfca8d587c2ffab8a89f2eb5a2f79502951c54 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -784,7 +784,8 @@ whichever comes first.
 Unlike `minibuffer-message', this function is called automatically
 via `set-message-function'."
   (when (and (not noninteractive)
-             (window-live-p (active-minibuffer-window)))
+             (window-live-p (active-minibuffer-window))
+             (eq (window-frame) (window-frame (active-minibuffer-window))))
     (with-current-buffer (window-buffer (active-minibuffer-window))
       (setq message (if (string-match-p "\\` *\\[.+\\]\\'" message)
                         ;; Make sure we can put-text-property.