(menu-bar-menu-frame-live-and-visible-p)

(menu-bar-non-minibuffer-window-p): Instead of checking display-multi-frame-p,
use selected-frame when menu-updating-frame is nil.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 6fa8c8b0f03e76367c05001b655b15169a51b25d..afc207bc9f058471d27037f3472fc9cfbb158841 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1418,8 +1418,7 @@ key, a click, or a menu-item"))
 (defun menu-bar-menu-frame-live-and-visible-p ()
   "Return non-nil if the menu frame is alive and visible.
 The menu frame is the frame for which we are updating the menu."
-  (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame
-                     (selected-frame))))
+  (let ((menu-frame (or menu-updating-frame (selected-frame))))
     (and (frame-live-p menu-frame)
         (frame-visible-p menu-frame))))
 
@@ -1428,8 +1427,7 @@ The menu frame is the frame for which we are updating the menu."
 
 See the documentation of `menu-bar-menu-frame-live-and-visible-p'
 for the definition of the menu frame."
-  (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame
-                     (selected-frame))))
+  (let ((menu-frame (or menu-updating-frame (selected-frame))))
     (not (window-minibuffer-p (frame-selected-window menu-frame)))))
 
 (defun kill-this-buffer ()     ; for the menu bar