diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-07 17:35:27 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-07 17:35:27 -0700 |
| commit | 36cf8493aff99b652b2ad8c9e4d55a18688e8484 (patch) | |
| tree | f8ff499c2ee5e91b20d8576841f0e6bf91d1ba34 /lisp/menu-bar.el | |
| parent | 2be772ff45057215c1c70252008c1f9703ef3bff (diff) | |
| parent | da8de2908c35ad1fd5c437486d2ea5f6ebb75ca3 (diff) | |
| download | emacs-36cf8493aff99b652b2ad8c9e4d55a18688e8484.tar.gz | |
Merge from emacs-24; up to 2014-06-01T23:37:59Z!eggert@cs.ucla.edu
Diffstat (limited to 'lisp/menu-bar.el')
| -rw-r--r-- | lisp/menu-bar.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index efbeeb3579c..c816488c6d1 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -2272,6 +2272,12 @@ If FRAME is nil or not given, use the selected frame." ((eq type 'w32) (w32-menu-bar-open frame)) ((and (null tty-menu-open-use-tmm) (not (zerop (or (frame-parameter nil 'menu-bar-lines) 0)))) + ;; Make sure the menu bar is up to date. One situation where + ;; this is important is when this function is invoked by name + ;; via M-x, in which case the menu bar includes the "Minibuf" + ;; menu item that should be removed when we exit the minibuffer. + (force-mode-line-update) + (redisplay) (let* ((x tty-menu--initial-menu-x) (menu (menu-bar-menu-at-x-y x 0 frame))) (popup-menu (or |