[Emacs-diffs] Changes to emacs/lisp/tmm.el

[Nick Roberts]

Index: emacs/lisp/tmm.el
diff -c emacs/lisp/tmm.el:1.39 emacs/lisp/tmm.el:1.40
*** emacs/lisp/tmm.el:1.39      Mon Sep  1 15:45:17 2003
--- emacs/lisp/tmm.el   Fri May 13 23:23:42 2005
***************
*** 395,401 ****
  `x-popup-menu' argument (when IN-X-MENU is not-nil).
  This function adds the element only if it is not already present.
  It uses the free variable `tmm-table-undef' to keep undefined keys."
!   (let (km str cache plist filter visible (event (car elt)))
      (setq elt (cdr elt))
      (if (eq elt 'undefined)
        (setq tmm-table-undef (cons (cons event nil) tmm-table-undef))
--- 395,401 ----
  `x-popup-menu' argument (when IN-X-MENU is not-nil).
  This function adds the element only if it is not already present.
  It uses the free variable `tmm-table-undef' to keep undefined keys."
!   (let (km str cache plist filter visible enable (event (car elt)))
      (setq elt (cdr elt))
      (if (eq elt 'undefined)
        (setq tmm-table-undef (cons (cons event nil) tmm-table-undef))
***************
*** 436,441 ****
--- 436,444 ----
               (setq visible (plist-get plist :visible))
               (if visible
                   (setq km (and (eval visible) km)))
+              (setq enable (plist-get plist :enable))
+              (if enable
+                  (setq km (and (eval enable) km)))
               (and str
                    (consp (nth 3 elt))
                    (stringp (cdr (nth 3 elt))) ; keyseq cache