In enable predicates in Files menu, use menu-updating-frame.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 60ef3a8ea597a8c9ea85c4d5b82b7137a7b3c269..6132e23526fdd49dff53942131b34c33d941db67 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -346,26 +346,26 @@ Do the same for the keys of the same name."
       (or (string-match "^ " (buffer-name (car buffers)))
          (setq count (1+ count)))
       (setq buffers (cdr buffers)))
-    (and (not (window-minibuffer-p (selected-window)))
+    (and (not (window-minibuffer-p (frame-selected-window menu-updating-frame)))
         (> count 1))))
 
 (put 'kill-this-buffer 'menu-enable '(kill-this-buffer-enabled-p))
 
 (put 'save-buffer 'menu-enable
      '(and (buffer-modified-p)
-          (not (window-minibuffer-p (selected-window)))))
+          (not (window-minibuffer-p (frame-selected-window menu-updating-frame)))))
 
 (put 'write-file 'menu-enable
-     '(not (window-minibuffer-p (selected-window))))
+     '(not (window-minibuffer-p (frame-selected-window menu-updating-frame))))
 
 (put 'find-file 'menu-enable
-     '(not (window-minibuffer-p (selected-window))))
+     '(not (window-minibuffer-p (frame-selected-window menu-updating-frame))))
 
 (put 'dired 'menu-enable
-     '(not (window-minibuffer-p (selected-window))))
+     '(not (window-minibuffer-p (frame-selected-window menu-updating-frame))))
 
 (put 'insert-file 'menu-enable
-     '(not (window-minibuffer-p (selected-window))))
+     '(not (window-minibuffer-p (frame-selected-window menu-updating-frame))))
 
 (put 'revert-buffer 'menu-enable
      '(or revert-buffer-function revert-buffer-insert-file-contents-function