aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2004-04-21 19:14:49 +0000
committerRichard M. Stallman2004-04-21 19:14:49 +0000
commit67d170f2d238536b6180b922d797e9c1cf6ed198 (patch)
tree79c004fee5ee59e3df564bfbade4cbce83f859df
parentdc0485c4f86e8754635ecd2003188d3894c23974 (diff)
downloademacs-67d170f2d238536b6180b922d797e9c1cf6ed198.tar.gz
emacs-67d170f2d238536b6180b922d797e9c1cf6ed198.zip
(easy-menu-add): Do call x-popup-menu, but only if it's defined.
-rw-r--r--lisp/emacs-lisp/easymenu.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 88f7657b6bf..dbd7194f50a 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -478,8 +478,8 @@ Do it only if `easy-menu-precalculate-equivalent-keybindings' is on."
478 (when easy-menu-precalculate-equivalent-keybindings 478 (when easy-menu-precalculate-equivalent-keybindings
479 (if (and (symbolp menu) (not (keymapp menu)) (boundp menu)) 479 (if (and (symbolp menu) (not (keymapp menu)) (boundp menu))
480 (setq menu (symbol-value menu))) 480 (setq menu (symbol-value menu)))
481 ;; x-popup-menu does not exist on tty-only Emacs. 481 (and (keymapp menu) (fboundp 'x-popup-menu)
482 ;; (if (keymapp menu) (x-popup-menu nil menu)) 482 (x-popup-menu nil menu))
483 )) 483 ))
484 484
485(defun add-submenu (menu-path submenu &optional before in-menu) 485(defun add-submenu (menu-path submenu &optional before in-menu)