* mime-view.el (mime-view-default-charset): Rename from

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

diff --git a/semi-def.el b/semi-def.el
index a9a94ba..96cc2ed 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(require 'poe)
-
 (eval-when-compile (require 'cl))
 
 (require 'custom)
@@ -79,9 +77,9 @@
 ;;;
 
 (defcustom mime-browse-url-regexp
-  (concat "\\(http\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):"
+  (concat "\\(https?\\|ftps?\\|file\\|gopher\\|news\\|nntps?\\|telnets?\\|wais\\|mailto\\):"
          "\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?"
-         "[-a-zA-Z0-9_=?#$@~`%&*+|\\/.,]*[-a-zA-Z0-9_=#$@~`%&*+|\\/]")
+         "[-a-zA-Z0-9_=?#$@~`%&*+|\\/.,;]*[-a-zA-Z0-9_=#$@~`%&*+|\\/;]")
   "Regexp to match URL in text body."
   :group 'mime
   :type 'regexp)
@@ -105,42 +103,52 @@
 ;;; @ menu
 ;;;
 
-(defun-maybe-cond select-menu-alist (title menu-alist)
-  ((fboundp 'popup-menu)
-   ;; While XEmacs can have both X and tty frames at the same time with
-   ;; gnuclient, we shouldn't emulate in text-mode here.
-   (let (ret)
-     (popup-menu
-      ;; list* is CL function, but CL is a part of XEmacs.
-      (list* title
-            "---"
-            (mapcar
-             (lambda (cell)
-               (vector (car cell)
-                       `(progn
-                          (setq ret ',(cdr cell))
-                          (throw 'exit nil))
-                       t)))
-            menu-alist))
-     (recursive-edit)
-     ret))
-  (window-system
-   (x-popup-menu t (list title (cons title menu-alist)))))
-
-(defmacro mime-menu-bogus-filter-constructor (name 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))))
-
-(defmacro mime-menu-popup (event menu)
-  (if (fboundp 'popup-menu)
-      `(popup-menu ,menu)
-    ;; #### Kludge for GNU Emacs 20.7 or earlier.
-    `(let (bogus-menu)
-       (easy-menu-define bogus-menu nil nil ,menu)
-       (mime-menu-bogus-filter-constructor "Popup" bogus-menu))))
+(defmacro mime-popup-menu-bogus-filter-constructor (menu)
+  ;; #### 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.
+
+(static-if (featurep 'xemacs)
+    (defalias 'mime-popup-menu-popup 'popup-menu)
+  (defun mime-popup-menu-popup (menu &optional event)
+    (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)
+    (mime-popup-menu-bogus-filter-constructor menu)))
+
+(static-if (featurep 'xemacs)
+    (defun mime-should-use-popup-menu ()
+      (mouse-event-p last-command-event))
+  (defun mime-should-use-popup-menu ()
+    (memq 'click (event-modifiers last-command-event))))
+
+(defun mime-menu-select (prompt menu &optional event)
+  (if (mime-should-use-popup-menu)
+      (mime-popup-menu-select menu event)
+    (let ((rest (cdr menu)))
+      (while rest
+       (setcar rest (append (car rest) nil))
+       (setq rest (cdr rest)))
+      (nth 1 (assoc (completing-read prompt (cdr menu)) (cdr menu))))))
 
 
 ;;; @ Other Utility