(easy-menu-current-active-maps): Test

if symbol is bound before getting its value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67c1c0e..3f08afe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-14  Gerd Moellmann  <gerd@gnu.org>
+
+       * emacs-lisp/easymenu.el (easy-menu-current-active-maps): Test
+       if symbol is bound before getting its value.
+
+       * tooltip.el (tooltip-show): If an error is signaled in
+       x-show-tip, display that error, and display the help in the
+       echo area.
+
 2000-12-14  Kenichi Handa  <handa@etl.go.jp>
 
        * international/ja-dic-cnv.el (skkdic-set-okuri-nasi): Show

diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 6307e50..4364381 100644 (file)
--- 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 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Keywords: emulations
 ;; Author: rms
@@ -544,7 +544,9 @@ If item is an old format item, a new format item is returned."
 (defun easy-menu-current-active-maps ()
   (let ((maps (list (current-local-map) global-map)))
     (dolist (minor minor-mode-map-alist)
-      (if (symbol-value (car minor)) (push (cdr minor) maps)))
+      (when (and (boundp (car minor))
+                (symbol-value (car minor)))
+       (push (cdr minor) maps)))
     (delq nil maps)))
 
 (defun easy-menu-get-map (map path &optional to-modify)