Move SEMI depended definitions to semi-def.el.

diff --git a/mime-def.el b/mime-def.el
index e9ef9e3..3dc6d92 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -24,7 +24,6 @@
 
 ;;; Code:
 
-(require 'emu)
 (require 'custom)
 
 (defgroup mime nil
@@ -51,34 +50,6 @@
             x))))
   )
 
-(defconst mime-module-version '("SEMI" "Naoetsu" 1 2 2)
-  "Implementation name, version name and numbers of MIME-kernel package.")
-
-(autoload 'mule-caesar-region "mule-caesar"
-  "Caesar rotation of current region." t)
-
-
-;;; @ variables
-;;;
-
-(defvar mime/use-multi-frame
-  (and (>= emacs-major-version 19) window-system))
-
-(defvar mime/find-file-function
-  (if mime/use-multi-frame
-      (function find-file-other-frame)
-    (function find-file)
-    ))
-
-
-;;; @ constants
-;;;
-
-(defconst mime-echo-buffer-name "*MIME-echo*"
-  "Name of buffer to display MIME-playing information.")
-
-(defconst mime-temp-buffer-name " *MIME-temp*")
-
 
 ;;; @ definitions about MIME
 ;;;
@@ -91,233 +62,6 @@
   (concat mime-token-regexp "/" mime-token-regexp))
 
 
-;;; @ button
-;;;
-
-(defcustom mime-button-face 'bold
-  "Face used for content-button or URL-button of MIME-Preview buffer."
-  :group 'mime
-  :type 'face)
-
-(defcustom mime-button-mouse-face 'highlight
-  "Face used for MIME-preview buffer mouse highlighting."
-  :group 'mime
-  :type 'face)
-
-(defsubst mime-add-button (from to function &optional data)
-  "Create a button between FROM and TO with callback FUNCTION and DATA."
-  (let ((overlay (make-overlay from to)))
-    (and mime-button-face
-        (overlay-put overlay 'face mime-button-face))
-    (and mime-button-mouse-face
-        (overlay-put overlay 'mouse-face mime-button-mouse-face))
-    (add-text-properties from to (list 'mime-button-callback function))
-    (and data
-        (add-text-properties from to (list 'mime-button-data data)))
-    ;;(add-text-properties from to (list 'keymap widget-keymap))
-    ))
-
-(defsubst mime-insert-button (string function &optional data)
-  "Insert STRING as button with callback FUNCTION and DATA."
-  (save-restriction
-    (narrow-to-region (point)(point))
-    (insert (concat "[" string "]"))
-    ;; (widget-push-button-value-create
-    ;;  (widget-convert 'push-button
-    ;;                  :notify (lambda (&rest ignore)
-    ;;                            (mime-preview-play-current-entity)
-    ;;                            )
-    ;;                  string))
-    (insert "\n")
-    (mime-add-button (point-min)(point-max) function data)
-    ))
-
-(defvar mime-button-mother-dispatcher nil)
-
-(defun mime-button-dispatcher (event)
-  "Select the button under point."
-  (interactive "e")
-  (let (buf point func data)
-    (save-window-excursion
-      (mouse-set-point event)
-      (setq buf (current-buffer)
-           point (point)
-           func (get-text-property (point) 'mime-button-callback)
-           data (get-text-property (point) 'mime-button-data)
-           )
-      )
-    (save-excursion
-      (set-buffer buf)
-      (goto-char point)
-      (if func
-         (apply func data)
-       (if (fboundp mime-button-mother-dispatcher)
-           (funcall mime-button-mother-dispatcher event)
-         )
-       ))))
-
-
-;;; @ PGP
-;;;
-
-(defvar pgp-function-alist
-  '(
-    ;; for mime-pgp
-    (verify            mc-verify                       "mc-toplev")
-    (decrypt           mc-decrypt                      "mc-toplev")
-    (fetch-key         mc-pgp-fetch-key                "mc-pgp")
-    (snarf-keys                mc-snarf-keys                   "mc-toplev")
-    ;; for mime-edit
-    (mime-sign         mime-mc-pgp-sign-region         "mime-mc")
-    (traditional-sign  mc-pgp-sign-region              "mc-pgp")
-    (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.
-Each element looks like (SERVICE FUNCTION FILE).
-
-SERVICE is a symbol of PGP processing.  It allows `verify', `decrypt',
-`fetch-key', `snarf-keys', `mime-sign', `traditional-sign', `encrypt'
-or `insert-key'.
-
-Function is a symbol of function to do specified SERVICE.
-
-FILE is string of filename which has definition of corresponding
-FUNCTION.")
-
-(defmacro pgp-function (method)
-  "Return function to do service METHOD."
-  `(cadr (assq ,method (symbol-value 'pgp-function-alist)))
-  )
-
-(mapcar (function
-        (lambda (method)
-          (autoload (cadr method)(nth 2 method))
-          ))
-       pgp-function-alist)
-
-
-;;; @ method selector kernel
-;;;
-
-(require 'atype)
-
-;;; @@ field unifier
-;;;
-
-(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)
-      )))
-
-
-;;; @ 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
-           (let ((name (symbol-name sym)))
-             (intern
-              (concat (if (string-match "\\(.*\\)-list" name)
-                          (substring name 0 (match-end 1))
-                        name)
-                      "-regexp")
-              )))
-      )
-  (set sym field-list)
-  (set regexp-sym
-       (concat "^" (apply (function regexp-or) field-list) ":"))
-  )
-
-(defun tm:add-fields (sym field-list &optional regexp-sym)
-  (or regexp-sym
-      (setq regexp-sym
-           (let ((name (symbol-name sym)))
-             (intern
-              (concat (if (string-match "\\(.*\\)-list" name)
-                          (substring name 0 (match-end 1))
-                        name)
-                      "-regexp")
-              )))
-      )
-  (let ((fields (eval sym)))
-    (mapcar (function
-            (lambda (field)
-              (or (member field fields)
-                  (setq fields (cons field fields))
-                  )
-              ))
-           (reverse field-list)
-           )
-    (set regexp-sym
-        (concat "^" (apply (function regexp-or) fields) ":"))
-    (set sym fields)
-    ))
-
-(defun tm:delete-fields (sym field-list &optional regexp-sym)
-  (or regexp-sym
-      (setq regexp-sym
-           (let ((name (symbol-name sym)))
-             (intern
-              (concat (if (string-match "\\(.*\\)-list" name)
-                          (substring name 0 (match-end 1))
-                        name)
-                      "-regexp")
-              )))
-      )
-  (let ((fields (eval sym)))
-    (mapcar (function
-            (lambda (field)
-              (setq fields (delete field fields))
-              ))
-           field-list)
-    (set regexp-sym
-        (concat "^" (apply (function regexp-or) fields) ":"))
-    (set sym fields)
-    ))
-
-
-;;; @ RCS version
-;;;
-
-(defsubst get-version-string (id)
-  "Return a version-string from RCS ID."
-  (and (string-match ",v \\([0-9][0-9.][0-9.]+\\)" id)
-       (substring id (match-beginning 1)(match-end 1))
-       ))
-
-
-;;; @ 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
 ;;;