[Emacs-diffs] emacs/lisp ChangeLog term/x-win.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/09/13 21:33:01

Modified files:
        lisp           : ChangeLog 
        lisp/term      : x-win.el 

Log message:
        * term/x-win.el (x-menu-bar-open): Only call accelerate-menu if it
        is defined (Bug#4405).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16161&r2=1.16162
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/x-win.el?cvsroot=emacs&r1=1.242&r2=1.243

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16161
retrieving revision 1.16162
diff -u -b -r1.16161 -r1.16162
--- ChangeLog   13 Sep 2009 21:09:05 -0000      1.16161
+++ ChangeLog   13 Sep 2009 21:32:58 -0000      1.16162
@@ -1,3 +1,8 @@
+2009-09-13  Chong Yidong  <address@hidden>
+
+       * term/x-win.el (x-menu-bar-open): Only call accelerate-menu if it
+       is defined (Bug#4405).
+
 2009-09-13  Vincent Belaïche  <address@hidden>
 
        * recentf.el (recentf-cleanup): Use a hash table to find

Index: term/x-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/x-win.el,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -b -r1.242 -r1.243
--- term/x-win.el       12 Sep 2009 19:04:26 -0000      1.242
+++ term/x-win.el       13 Sep 2009 21:33:00 -0000      1.243
@@ -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)))