(pgp-function-alist): `tm:mc-' -> `mime-mc-'.

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

diff --git a/mime-def.el b/mime-def.el
index a6f8abc..e2d1162 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: mime-def.el,v 0.24 1997-02-26 06:32:03 tmorioka Exp $
+;; Version: $Id: mime-def.el,v 0.42 1997-03-04 13:43:39 morioka Exp $
 ;; Keywords: definition, MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -25,20 +25,17 @@
 
 ;;; Code:
 
-;;; @ for XEmacs
-;;;
-
-(defvar running-xemacs (string-match "XEmacs" emacs-version))
-
-(if running-xemacs
-    (require 'overlay)
-  )
+(require 'cl)
+(require 'emu)
 
 
 ;;; @ variables
 ;;;
 
-(defvar mime/tmp-dir (or (getenv "TM_TMP_DIR") "/tmp/"))
+(defvar mime-temp-directory (or (getenv "MIME_TMP_DIR")
+                               (getenv "TM_TMP_DIR")
+                               "/tmp/")
+  "*Directory for temporary files.")
 
 (defvar mime/use-multi-frame
   (and (>= emacs-major-version 19) window-system))
@@ -60,26 +57,43 @@
 (defconst mime/temp-buffer-name " *MIME-temp*")
 
 
+;;; @ definitions about MIME
+;;;
+
+(defconst mime/tspecials "][\000-\040()<>@,\;:\\\"/?.=")
+(defconst mime/token-regexp (concat "[^" mime/tspecials "]+"))
+(defconst mime-charset-regexp mime/token-regexp)
+
+(defconst mime/content-type-subtype-regexp
+  (concat mime/token-regexp "/" mime/token-regexp))
+
+(defconst mime/disposition-type-regexp mime/token-regexp)
+
+
 ;;; @ button
 ;;;
 
+(if running-xemacs
+    (require 'overlay)
+  )
+
 (defvar mime-button-face 'bold
   "Face used for content-button or URL-button of MIME-Preview buffer.")
 
 (defvar mime-button-mouse-face 'highlight
   "Face used for MIME-preview buffer mouse highlighting.")
 
-(defun tm:add-button (from to func &optional data)
+(defun mime-add-button (from to func &optional data)
   "Create a button between FROM and TO with callback FUNC and data DATA."
   (and mime-button-face
        (overlay-put (make-overlay from to) 'face mime-button-face))
-  (tl:add-text-properties from to
-                         (nconc
-                          (and mime-button-mouse-face
-                               (list 'mouse-face mime-button-mouse-face))
-                          (list 'mime-button-callback func)
-                          (and data (list 'mime-button-data data))
-                          ))
+  (add-text-properties from to
+                      (nconc
+                       (and mime-button-mouse-face
+                            (list 'mouse-face mime-button-mouse-face))
+                       (list 'mime-button-callback func)
+                       (and data (list 'mime-button-data data))
+                       ))
   )
 
 (defvar mime-button-mother-dispatcher nil)
@@ -118,9 +132,9 @@
     (fetch-key         mc-pgp-fetch-key                "mc-pgp")
     (snarf-keys                mc-snarf-keys                   "mc-toplev")
     ;; for mime-edit
-    (mime-sign         tm:mc-pgp-sign-region           "mime-edit-mc")
+    (mime-sign         mime-mc-pgp-sign-region         "mime-mc")
     (traditional-sign  mc-pgp-sign-region              "mc-pgp")
-    (encrypt           tm:mc-pgp-encrypt-region        "mime-edit-mc")
+    (encrypt           mime-mc-pgp-encrypt-region      "mime-mc")
     (insert-key                mc-insert-public-key            "mc-toplev")
     )
   "Alist of service names vs. corresponding functions and its filenames.
@@ -147,17 +161,22 @@ FUNCTION.")
        pgp-function-alist)
 
 
-;;; @ definitions about MIME
+;;; @ method selector kernel
 ;;;
 
-(defconst mime/tspecials "][\000-\040()<>@,\;:\\\"/?.=")
-(defconst mime/token-regexp (concat "[^" mime/tspecials "]+"))
-(defconst mime-charset-regexp mime/token-regexp)
+(require 'atype)
 
-(defconst mime/content-type-subtype-regexp
-  (concat mime/token-regexp "/" mime/token-regexp))
+;;; @@ field unifier
+;;;
 
-(defconst mime/disposition-type-regexp mime/token-regexp)
+(defun field-unifier-for-mode (a b)
+  (let ((va (cdr a)))
+    (if (if (consp va)
+           (member (cdr b) va)
+         (equal va (cdr b))
+         )
+       (list nil b nil)
+      )))
 
 
 ;;; @ rot13-47
@@ -295,6 +314,29 @@ ROT47 will be performed for Japanese text in any case."
        ))
 
 
+;;; @ Other Utility
+;;;
+
+(defsubst eliminate-top-spaces (string)
+  "Eliminate top sequence of space or tab in STRING."
+  (if (string-match "^[ \t]+" string)
+      (substring string (match-end 0))
+    string))
+
+(defun call-after-loaded (module func &optional hook-name)
+  "If MODULE is provided, then FUNC is called.
+Otherwise func is set to MODULE-load-hook.
+If optional argument HOOK-NAME is specified,
+it is used as hook to set."
+  (if (featurep module)
+      (funcall func)
+    (or hook-name
+       (setq hook-name (intern (concat (symbol-name module) "-load-hook")))
+       )
+    (add-hook hook-name func)
+    ))
+
+
 ;;; @ end
 ;;;