* 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 cedf911..96cc2ed 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -79,7 +79,7 @@
 (defcustom mime-browse-url-regexp
   (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)
@@ -113,7 +113,8 @@
         (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))
+        (if (eq t (compare-strings "menu-function-" 0 nil
+                                   (symbol-name function) 0 14))
             (car (last (symbol-function function)))
           function)))))
 
@@ -134,6 +135,21 @@
   (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
 ;;;