mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-10 00:00:39 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
if symbol is bound before getting its value.
This commit is contained in:
Gerd Moellmann 2000-12-14 10:36:42 +00:00
parent e56031492e
commit 5e5b3d4114
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -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> 2000-12-14 Kenichi Handa <handa@etl.go.jp>
* international/ja-dic-cnv.el (skkdic-set-okuri-nasi): Show * international/ja-dic-cnv.el (skkdic-set-okuri-nasi): Show

6
lisp/emacs-lisp/easymenu.el
View file

@ -1,6 +1,6 @@
;;; easymenu.el --- support the easymenu interface for defining a menu. ;;; 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 ;; Keywords: emulations
;; Author: rms ;; 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 () (defun easy-menu-current-active-maps ()
(let ((maps (list (current-local-map) global-map))) (let ((maps (list (current-local-map) global-map)))
(dolist (minor minor-mode-map-alist) (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))) (delq nil maps)))
(defun easy-menu-get-map (map path &optional to-modify) (defun easy-menu-get-map (map path &optional to-modify)