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
commitb1b2ae81628a5edce8492e5e1004de8f2a15830d (patch)
tree83fcc3471d71c3ab250d60b5007bacf47855ea36 /lisp/emacs-lisp
parent066a4c6b91d04c1b77c670c1dbd63ea036e3e411 (diff)
downloademacs-b1b2ae81628a5edce8492e5e1004de8f2a15830d.tar.gz
emacs-b1b2ae81628a5edce8492e5e1004de8f2a15830d.tar.bz2
emacs-b1b2ae81628a5edce8492e5e1004de8f2a15830d.zip
(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.