* mime-edit.el: Don't require `invisible'.

[elisp/semi.git] / semi-def.el

diff --git a/semi-def.el b/semi-def.el
index ba0e34f..f39d217 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -106,11 +106,18 @@
 ;;;
 
 (defmacro mime-popup-menu-bogus-filter-constructor (menu)
-  `(let (x y)
-     (setq x (x-popup-menu t ,menu)
-          y (and x (lookup-key ,menu (apply #'vector x))))
-     (if (and x y)
-        (funcall y))))
+  ;; #### Kludge for FSF Emacs-style menu.
+  (let ((bogus-menu (make-symbol "bogus-menu")))
+    `(let (,bogus-menu selection function)
+       (easy-menu-define ,bogus-menu nil nil ,menu)
+       (setq selection (x-popup-menu t ,bogus-menu))
+       (when selection
+        (setq function (lookup-key ,bogus-menu (apply #'vector selection)))
+        ;; If a callback entry has no name, easy-menu wraps its value.
+        ;; See `easy-menu-make-symbol'.
+        (if (eq t (compare-strings "menu-function-" 0 nil (symbol-name function) 0 14))
+            (car (last (symbol-function function)))
+          function)))))
 
 ;;; While XEmacs can have both X and tty frames at the same time with
 ;;; gnuclient, we shouldn't emulate in text-mode here.
@@ -118,20 +125,16 @@
 (static-if (featurep 'xemacs)
     (defalias 'mime-popup-menu-popup 'popup-menu)
   (defun mime-popup-menu-popup (menu &optional event)
-    (let (bogus-menu)
-      ;; #### Kludge for FSF Emacs-style menu.
-      (easy-menu-define bogus-menu nil nil menu)
-      (mime-popup-menu-bogus-filter-constructor bogus-menu))))
+    (let ((function (mime-popup-menu-bogus-filter-constructor menu)))
+      (when (symbolp function)
+       (funcall function)))))
 
 (static-if (featurep 'xemacs)
     (defun mime-popup-menu-select (menu &optional event)
       (let ((selection (get-popup-menu-response menu event)))
        (event-object selection)))
   (defun mime-popup-menu-select (menu &optional event)
-    (let (bogus-menu)
-      ;; #### Kludge for FSF Emacs-style menu.
-      (easy-menu-define bogus-menu nil nil menu)
-      (x-popup-menu t bogus-menu))))
+    (mime-popup-menu-bogus-filter-constructor menu)))
 
 
 ;;; @ Other Utility