diff options
author | Miles Bader <miles@gnu.org> | 2005-05-05 00:04:55 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-05-05 00:04:55 +0000 |
commit | cca4e3b099ec4c3f4a36fd0cb865c618a5589069 (patch) | |
tree | 711e73e53dbe1ab3a59b53fb56a10836e777b43e /lisp/emacs-lisp/easymenu.el | |
parent | d469f5c370dbb6fac0e8d6687b47ccfcf96a13a5 (diff) | |
parent | d68a5392cafedbe0ee6c3eca0444fce4a58b6cdf (diff) | |
download | emacs-cca4e3b099ec4c3f4a36fd0cb865c618a5589069.tar.gz emacs-cca4e3b099ec4c3f4a36fd0cb865c618a5589069.tar.bz2 emacs-cca4e3b099ec4c3f4a36fd0cb865c618a5589069.zip |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-44
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 272-288)
- src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 67)
- Update from CVS
Diffstat (limited to 'lisp/emacs-lisp/easymenu.el')
-rw-r--r-- | lisp/emacs-lisp/easymenu.el | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index b0f3b9b9d3e..78ba1fe27bf 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -160,18 +160,18 @@ A menu item can be a list with the same format as MENU. This is a submenu." (let ((keymap (easy-menu-create-menu (car menu) (cdr menu)))) (when symbol (set symbol keymap) - (fset symbol - `(lambda (event) ,doc (interactive "@e") - ;; FIXME: XEmacs uses popup-menu which calls the binding - ;; while x-popup-menu only returns the selection. - (x-popup-menu event - (or (and (symbolp ,symbol) - (funcall - (or (plist-get (get ,symbol 'menu-prop) - :filter) - 'identity) - (symbol-function ,symbol))) - ,symbol))))) + (defalias symbol + `(lambda (event) ,doc (interactive "@e") + ;; FIXME: XEmacs uses popup-menu which calls the binding + ;; while x-popup-menu only returns the selection. + (x-popup-menu event + (or (and (symbolp ,symbol) + (funcall + (or (plist-get (get ,symbol 'menu-prop) + :filter) + 'identity) + (symbol-function ,symbol))) + ,symbol))))) (mapcar (lambda (map) (define-key map (vector 'menu-bar (easy-menu-intern (car menu))) (cons 'menu-item |