summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2004-04-09 16:41:36 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2004-04-09 16:41:36 +0000
commitdf014ac0b9e894e2c9ddbd7e04aa80bc68b6a85e (patch)
treeca81ddf980f0b35cb71f30a546a8532a78ddfbe4 /lisp/emacs-lisp
parente457bcf21d975f8f023e8e8cb81d06f655ee5547 (diff)
downloademacs-df014ac0b9e894e2c9ddbd7e04aa80bc68b6a85e.tar.gz
(easy-menu-add): Make it work in non-X Emacs.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/easymenu.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 5a2a33575e7..88f7657b6bf 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -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 @@ Do it only if `easy-menu-precalculate-equivalent-keybindings' is on."
(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.