Infinite mutual recursion in multi-tty "menu-bar-open"

[sand]

Revision 1.302.4.1 of menu-bar.el (on the multi-tty branch) includes the 
following delta:

http://cvs.savannah.gnu.org/viewvc/emacs/lisp/menu-bar.el?root=emacs&r1=1.302&r2=1.302.4.1
1772             (defun menu-bar-open (&optional frame)
1773               "Start key navigation of the menu bar in FRAME.
1774             
1775             This function decides which method to use to access the menu
1776             depending on FRAME's terminal device.  On X displays, it calls
1777             `x-menu-bar-open'; otherwise it calls `tmm-menubar'.
1778             
1779             If FRAME is nil or not given, use the selected frame."
1780               (interactive)
1781               (if (eq window-system 'x)
1782                   (x-menu-bar-open frame)
1783                 (with-selected-frame (or frame (selected-frame))
1784                   (tmm-menubar))))

Note how "menu-bar-open" calls "x-menu-bar-open".  Since revision 1.193, 
term/x-win.el has had the following definition for "x-menu-bar-open":

http://cvs.savannah.gnu.org/viewvc/emacs/lisp/term/x-win.el?annotate=1.200.4.3&root=emacs
2411 :  jhd     1.193   (defun x-menu-bar-open (&optional frame)
2412 :                    "Open the menu bar if `menu-bar-mode' is on. 
otherwise call `tmm-menubar'."
2413 :                    (interactive "i")
2414 :                    (if menu-bar-mode (menu-bar-open frame)
2415 :                      (tmm-menubar)))

Note how "x-menu-bar-open" calls "menu-bar-open".

So when running in X with a menu bar, hitting <f10> calls menu-bar-open, which 
calls x-menu-bar-open, which calls menu-bar-open, which ... generates an error 
message about exceeding lisp-max-eval-depth.

Can we get a fix?  It's not a dire problem, but I doubt that the current 
behavior matches anyones expectations.

Thanks,

Derek

--
Derek L. Upham
sand@blarg.net