update.

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

diff --git a/semi-def.el b/semi-def.el
index bff40af..608b1dd 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -1,11 +1,11 @@
-;;; semi-def.el --- definition module for SEMI
+;;; semi-def.el --- definition module for REMI
 
 ;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: definition, MIME, multimedia, mail, news
 
-;; This file is part of SEMI (Spadework for Emacs MIME Interfaces).
+;; This file is part of REMI (Radical Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -29,26 +29,13 @@
 (eval-when-compile (require 'cl))
 
 
-(defconst mime-module-version '("SEMI" "Kajiyashiki" 1 3 4)
+(defconst mime-module-version '("SEMI" "Kurobe" 1 5 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
 ;;;
 
@@ -81,21 +68,13 @@
     (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")
+    (insert (concat "[" string "]\n"))
     (mime-add-button (point-min)(point-max) function data)
     ))
 
@@ -111,8 +90,7 @@
            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)
@@ -191,8 +169,7 @@ FUNCTION.")
 
 (defmacro pgp-function (method)
   "Return function to do service METHOD."
-  `(cadr (assq ,method (symbol-value 'pgp-function-alist)))
-  )
+  `(cadr (assq ,method (symbol-value 'pgp-function-alist))))
 
 (mapcar (function
         (lambda (method)
@@ -268,16 +245,6 @@ FUNCTION.")
     ))
 
 
-;;; @ 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
 ;;;
 
@@ -295,6 +262,41 @@ it is used as hook to set."
     ))
 
 
+(defvar mime-condition-type-alist
+  '((preview . mime-preview-condition)
+    (action . mime-acting-condition)))
+
+(defvar mime-condition-mode-alist
+  '((with-default . ctree-set-calist-with-default)
+    (t . ctree-set-calist-strictly)))
+
+(defun mime-add-condition (target-type condition &optional mode file)
+  "Add CONDITION to database specified by TARGET-TYPE.
+TARGET-TYPE must be 'preview or 'action.  
+If optional argument MODE is 'strict or nil (omitted), CONDITION is
+added strictly.
+If optional argument MODE is 'with-default, CONDITION is added with
+default rule.
+If optional argument FILE is specified, it is loaded when CONDITION is
+activate."
+  (let ((sym (cdr (assq target-type mime-condition-type-alist))))
+    (if sym
+       (let ((func (cdr (or (assq mode mime-condition-mode-alist)
+                            (assq t mime-condition-mode-alist)))))
+         (if (fboundp func)
+             (progn
+               (funcall func sym condition)
+               (if file
+                   (let ((method (cdr (assq 'method condition))))
+                     (autoload method file)
+                     ))
+               )
+           (error "Function for mode `%s' is not found." mode)
+           ))
+      (error "Variable for target-type `%s' is not found." target-type)
+      )))
+
+
 ;;; @ end
 ;;;