release.

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

diff --git a/mime-def.el b/mime-def.el
index b6fa370..35bda0d 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -32,10 +32,8 @@
 (require 'mcharset)
 (require 'alist)
 
 (require 'mcharset)
 (require 'alist)
 

-(eval-when-compile (require 'cl))      ; list*
-

 (eval-and-compile
 (eval-and-compile

-  (defconst mime-library-product ["CLIME" (1 13 0) "\e$B?7K!N4;{\e(B"]
+  (defconst mime-library-product ["CLIME" (1 13 3) "\e$BJ?C<\e(B"]

     "Product name, version number and code name of MIME-library package.")
   )
 
     "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) " "
 (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) "\"")))
 
                       (mime-product-version mime-library-product) ".")
            " - \"" (mime-product-code-name mime-library-product) "\"")))
 

@@ -59,8 +57,6 @@
 ;;; @ variables
 ;;;
 
 ;;; @ variables
 ;;;
 

-(require 'custom)
-

 (defgroup mime '((default-mime-charset custom-variable))
   "Emacs MIME Interfaces"
   :group 'news
 (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)
 ;;;
 
 (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."
 
 (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))
 
 (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))))))
 
                                          parents)
                                  '(mime-entity))))))
 

@@ -382,9 +378,10 @@ service."
 If PARENTS is specified, TYPE inherits PARENTS.
 Each parent must be backend name (string)."
   (cons 'progn
 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)
                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))))
     (` (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)
 
 
 (put 'mel-define-method 'lisp-indent-function 'defun)