Mercurial > emacs
diff lisp/emacs-lisp/easymenu.el @ 83094:8e5779acd195
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-193
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-194
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-195
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-196
Remove RCS keywords
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-197
Stupid CVS keyword changes
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-198
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-199
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-134
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 10 Apr 2004 23:06:09 +0000 |
| parents | 1c98354c2113 |
| children | 3baddb82ae01 |
line wrap: on
line diff
--- a/lisp/emacs-lisp/easymenu.el Thu Apr 08 15:09:37 2004 +0000 +++ b/lisp/emacs-lisp/easymenu.el Sat Apr 10 23:06:09 2004 +0000 @@ -1,6 +1,6 @@ ;;; easymenu.el --- support the easymenu interface for defining a menu -;; Copyright (C) 1994, 1996, 1998, 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1994,96,98,1999,2000,2004 Free Software Foundation, Inc. ;; Keywords: emulations ;; Author: Richard Stallman <rms@gnu.org> @@ -478,7 +478,9 @@ (when easy-menu-precalculate-equivalent-keybindings (if (and (symbolp menu) (not (keymapp menu)) (boundp menu)) (setq menu (symbol-value menu))) - (if (keymapp menu) (x-popup-menu nil menu)))) + ;; x-popup-menu does not exist on tty-only Emacs. + ;; (if (keymapp menu) (x-popup-menu nil menu)) + )) (defun add-submenu (menu-path submenu &optional before in-menu) "Add submenu SUBMENU in the menu at MENU-PATH.