* term/x-win.el (x-menu-bar-open): Only call accelerate-menu if it

is defined (Bug#4405).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ad8e2f07cf89e0b235bda416a7eb648d237d445..c10bd3a0cc4f3bc6e58af884d2aa44c3965b2563 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
+
+       * term/x-win.el (x-menu-bar-open): Only call accelerate-menu if it
+       is defined (Bug#4405).
+
 2009-09-13  Vincent Belaïche  <vincent.belaiche@gmail.com>
 
        * recentf.el (recentf-cleanup): Use a hash table to find

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 39eab12f2a7478021e8011a1bba5f8cc90c4b417..2648865e0a036bb5ebddbff7e8349c9b5aee0cf2 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1445,7 +1445,9 @@ The value nil is the same as this list:
 (defun x-menu-bar-open (&optional frame)
   "Open the menu bar if `menu-bar-mode' is on. otherwise call `tmm-menubar'."
   (interactive "i")
-  (if menu-bar-mode (accelerate-menu frame)
+  (if (and menu-bar-mode
+          (fboundp 'accelerate-menu))
+      (accelerate-menu frame)
     (tmm-menubar)))
 
 \f