(tmm-get-keymap): Eval the menu name in `menu-item'.

2 files changed, 4 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cdfb4618547..e2bfc29089f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2000-12-02  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * tmm.el (tmm-get-keymap): Eval the menu name in `menu-item'.
+
         * textmodes/ispell.el (check-ispell-version): Don't use match-beginning
         to check if the match succeeded.
 
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 1db524ff22a..4a65efc75ba 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -429,7 +429,7 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
               ((eq (car-safe elt) 'menu-item)
                (setq plist (cdr-safe (cdr-safe (cdr-safe elt))))
                (setq km (nth 2 elt))
-               (setq str (nth 1 elt))
+               (setq str (eval (nth 1 elt)))
                (setq filter (plist-get plist :filter))
                (if filter
                    (setq km (funcall filter km)))
@@ -463,9 +463,7 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
           (setq km nil)))
       (and km str
            (or (assoc str tmm-km-list)
-               (setq tmm-km-list 
-                     (cons (cons str (cons event km)) tmm-km-list)))
-           ))))
+               (push (cons str (cons event km)) tmm-km-list))))))
 
 (defun tmm-get-keybind (keyseq)
   "Return the current binding of KEYSEQ, merging prefix definitions.