X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-def.el;h=35bda0dfc8d9e4a11b97ed383a20789592b268d4;hb=3562dd8af8e3c46cb7abf276cedfbe7a117b179c;hp=b6fa3700e77b52b30a25f9f58d6261064022e0e0;hpb=4beec9c087a83c1ac61e0f7187edb5dc15a4eed3;p=elisp%2Fflim.git

diff --git a/mime-def.el b/mime-def.el
index b6fa370..35bda0d 100644
--- a/mime-def.el
+++ b/mime-def.el
@@ -32,10 +32,8 @@
 (require 'mcharset)
 (require 'alist)
 
-(eval-when-compile (require 'cl))	; list*
-
 (eval-and-compile
-  (defconst mime-library-product ["CLIME" (1 13 0) "新法隆寺"]
+  (defconst mime-library-product ["CLIME" (1 13 3) "平端"]
     "Product name, version number and code name of MIME-library package.")
   )
 
@@ -51,7 +49,7 @@
 (defconst mime-library-version
   (eval-when-compile
     (concat (mime-product-name mime-library-product) " "
-	    (mapconcat (function number-to-string)
+	    (mapconcat (function int-to-string)
 		       (mime-product-version mime-library-product) ".")
 	    " - \"" (mime-product-code-name mime-library-product) "\"")))
 
@@ -59,8 +57,6 @@
 ;;; @ variables
 ;;;
 
-(require 'custom)
-
 (defgroup mime '((default-mime-charset custom-variable))
   "Emacs MIME Interfaces"
   :group 'news
@@ -157,10 +153,9 @@
 ;;;
 
 (defsubst make-mime-content-type (type subtype &optional parameters)
-  (list* (cons 'type type)
-	 (cons 'subtype subtype)
-	 (nreverse parameters))
-  )
+  (cons (cons 'type type)
+	(cons (cons 'subtype subtype)
+	      (nreverse parameters))))
 
 (defsubst mime-content-type-primary-type (content-type)
   "Return primary-type of CONTENT-TYPE."
@@ -270,9 +265,10 @@
 
 (defmacro mm-define-backend (type &optional parents)
   (` (luna-define-class (, (mm-expand-class-name type))
-			(, (nconc (mapcar (lambda (parent)
-					    (mm-expand-class-name parent)
-					    )
+			(, (nconc (mapcar (function
+					   (lambda (parent)
+					     (mm-expand-class-name parent)
+					     ))
 					  parents)
 				  '(mime-entity))))))
 
@@ -382,9 +378,10 @@ service."
 If PARENTS is specified, TYPE inherits PARENTS.
 Each parent must be backend name (string)."
   (cons 'progn
-	(mapcar (lambda (parent)
-		  (` (mel-copy-backend (, parent) (, type)))
-		  )
+	(mapcar (function
+		 (lambda (parent)
+		   (` (mel-copy-backend (, parent) (, type)))
+		   ))
 		parents)))
 
 (defmacro mel-define-method (name args &rest body)
@@ -397,8 +394,9 @@ and (nth 1 (car (last ARGS))) is name of backend (encoding)."
     (` (progn
 	 (mel-define-service (, name))
 	 (fset (intern (, class) (, (intern (format "%s-obarray" name))))
-	       (lambda (, (butlast args))
-		 (,@ body)))))))
+	       (function
+		(lambda (, (butlast args))
+		  (,@ body))))))))
 
 (put 'mel-define-method 'lisp-indent-function 'defun)