# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1135114891 0
# Node ID 4fc1898964648ba450fec4424b4a90af3612f0b0
# Parent  06f3a72bffb2ef8cc1f57d580e33824db02ca773
(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 -r 06f3a72bffb2 -r 4fc189896464 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Tue Dec 20 21:38:27 2005 +0000
+++ b/lisp/menu-bar.el	Tue Dec 20 21:41:31 2005 +0000
@@ -1418,8 +1418,7 @@
 (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 @@
 
 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