Update copyright header.

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

diff --git a/semi-def.el b/semi-def.el
index a9aed93..00cda9f 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -1,6 +1,6 @@
 ;;; semi-def.el --- definition module for SEMI -*- coding: iso-8859-4; -*-
 
-;; Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99,2000,01,03,05 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: definition, MIME, multimedia, mail, news
@@ -19,18 +19,16 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
-(require 'poe)
-
 (eval-when-compile (require 'cl))
 
 (require 'custom)
 
-(defconst mime-user-interface-product ["SEMI" (1 14 0) "Iburihashi"]
+(defconst mime-user-interface-product ["SEMI" (1 14 7) "Harue"]
   "Product name, version number and code name of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"
@@ -105,7 +103,7 @@
 ;;;
 
 (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_=#$@~`%&*+|\\/]")
   "*Regexp to match URL in text body."
@@ -130,39 +128,42 @@
 ;;; @ menu
 ;;;
 
-(if window-system
-    (if (featurep 'xemacs)
-       (defun select-menu-alist (title menu-alist)
-         (let (ret)
-           (popup-menu
-            (list* title
-                   "---"
-                   (mapcar (function
-                            (lambda (cell)
-                              (vector (car cell)
-                                      `(progn
-                                         (setq ret ',(cdr cell))
-                                         (throw 'exit nil)
-                                         )
-                                      t)
-                              ))
-                           menu-alist)
-                   ))
-           (recursive-edit)
-           ret))
-      (defun select-menu-alist (title menu-alist)
-       (x-popup-menu
-        (list '(1 1) (selected-window))
-        (list title (cons title menu-alist))
-        ))
-      )
-  (defun select-menu-alist (title menu-alist)
-    (cdr
-     (assoc (completing-read (concat title " : ") menu-alist)
-           menu-alist)
-     ))
-  )
-
+(static-cond ((featurep 'xemacs)
+             (defun mime-should-use-popup-menu ()
+               (and window-system
+                    (mouse-event-p last-command-event)))
+             (defun mime-select-menu-alist (title menu-alist)
+               (if (mime-should-use-popup-menu)
+                   (let (ret)
+                     (popup-menu
+                      (list* title
+                             "---"
+                             (mapcar (function
+                                      (lambda (cell)
+                                        (vector (car cell)
+                                                `(progn
+                                                   (setq ret ',(cdr cell))
+                                                   (throw 'exit nil))
+                                                t)))
+                                     menu-alist)))
+                     (recursive-edit)
+                     ret)
+                 (cdr
+                  (assoc (completing-read (concat title " : ") menu-alist)
+                         menu-alist)))))
+            (t
+             (defun mime-should-use-popup-menu ()
+               (and window-system
+                    (memq (event-basic-type last-command-event)
+                          '(mouse-1 mouse-2 mouse-3))))
+             (defun mime-select-menu-alist (title menu-alist)
+               (if (mime-should-use-popup-menu)
+                   (x-popup-menu
+                    (list '(1 1) (selected-window))
+                    (list title (cons title menu-alist)))
+                 (cdr
+                  (assoc (completing-read (concat title " : ") menu-alist)
+                         menu-alist))))))
 
 ;;; @ Other Utility
 ;;;