Variable `mime-preview/content-button-function' was abolished.

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

diff --git a/mime-def.el b/mime-def.el
index e29e23d..bcb3be2 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.20 1997-02-26 04:19:56 tmorioka Exp $
+;; Version: $Id: mime-def.el,v 0.44 1997-03-17 13:25:53 morioka Exp $
 ;; Keywords: definition, MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -25,14 +25,13 @@
 
 ;;; Code:
 
+(require 'cl)
 (require 'emu)
 
 
 ;;; @ variables
 ;;;
 
-(defvar mime/tmp-dir (or (getenv "TM_TMP_DIR") "/tmp/"))
-
 (defvar mime/use-multi-frame
   (and (>= emacs-major-version 19) window-system))
 
@@ -53,32 +52,50 @@
 (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.
-\[mime-def.el]")
+  "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. [mime-def.el]")
+  "Face used for MIME-preview buffer mouse highlighting.")
 
-(defun tm:add-button (from to func &optional data)
+(defsubst 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))
-                          ))
-  )
+  (let ((props (cons 'mime-button-callback
+                    (cons func
+                          (if data
+                              (list 'mime-button-data data)
+                            )))))
+    (if mime-button-mouse-face
+       (setq props (cons 'mouse-face (cons mime-button-mouse-face props)))
+      )
+    (add-text-properties from to props)
+    ))
 
-(defvar tm:mother-button-dispatcher nil)
+(defvar mime-button-mother-dispatcher nil)
 
-(defun tm:button-dispatcher (event)
+(defun mime-button-dispatcher (event)
   "Select the button under point."
   (interactive "e")
   (let (buf point func data)
@@ -95,8 +112,8 @@
       (goto-char point)
       (if func
          (apply func data)
-       (if (fboundp tm:mother-button-dispatcher)
-           (funcall tm:mother-button-dispatcher event)
+       (if (fboundp mime-button-mother-dispatcher)
+           (funcall mime-button-mother-dispatcher event)
          )
        ))))
 
@@ -112,9 +129,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.
@@ -141,17 +158,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
@@ -212,6 +234,9 @@ ROT47 will be performed for Japanese text in any case."
 ;;; @ field
 ;;;
 
+(defsubst regexp-or (&rest args)
+  (concat "\\(" (mapconcat (function identity) args "\\|") "\\)"))
+
 (defun tm:set-fields (sym field-list &optional regexp-sym)
   (or regexp-sym
       (setq regexp-sym
@@ -286,6 +311,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
 ;;;