# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1252877578 0
# Node ID 782f60a5e57a3fb56d4f4e466ae29a29f2c0bfa5
# Parent  5b946f8549660febb556738d4ccdcea77567c606
* term/x-win.el (x-menu-bar-open): Only call accelerate-menu if it
is defined (Bug#4405).

diff -r 5b946f854966 -r 782f60a5e57a lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Sep 13 21:21:40 2009 +0000
+++ b/lisp/ChangeLog	Sun Sep 13 21:32:58 2009 +0000
@@ -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 -r 5b946f854966 -r 782f60a5e57a lisp/term/x-win.el
--- a/lisp/term/x-win.el	Sun Sep 13 21:21:40 2009 +0000
+++ b/lisp/term/x-win.el	Sun Sep 13 21:32:58 2009 +0000
@@ -1445,7 +1445,9 @@
 (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)))