(mime-product-name): Use <(` ...)> and <(, ...)> instead of <`> and

<,>.
(mime-product-version): Likewise.
(mime-product-code-name): Likewise.
(mime-library-version): Use <(function ...)> instead of <#'...>.
(mm-expand-class-name): Use <(` ...)> and <(, ...)> instead of <`> and
<,>.
(mm-define-backend): Likewise.
(mm-define-method): Use <(` ...)>, <(, ...)> and <(,@ ...)> instead of
<`>, <,> and <,@>.
(mel-define-service): Likewise.
(mel-define-backend): Use <(` ...)> and <(, ...)> instead of <`> and
<,>.
(mel-define-method-function): Likewise.
(mel-define-function): Likewise.

diff --git a/mime-def.el b/mime-def.el
index 276dadd..b6fa370 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -35,23 +35,23 @@
 (eval-when-compile (require 'cl))      ; list*
 
 (eval-and-compile
-  (defconst mime-library-product ["FLIM" (1 13 2) "Kasanui"]
+  (defconst mime-library-product ["CLIME" (1 13 0) "\e$B?7K!N4;{\e(B"]
     "Product name, version number and code name of MIME-library package.")
   )
 
 (defmacro mime-product-name (product)
-  `(aref ,product 0))
+  (` (aref (, product) 0)))
 
 (defmacro mime-product-version (product)
-  `(aref ,product 1))
+  (` (aref (, product) 1)))
 
 (defmacro mime-product-code-name (product)
-  `(aref ,product 2))
+  (` (aref (, product) 2)))
 
 (defconst mime-library-version
   (eval-when-compile
     (concat (mime-product-name mime-library-product) " "
-           (mapconcat #'number-to-string
+           (mapconcat (function number-to-string)
                       (mime-product-version mime-library-product) ".")
            " - \"" (mime-product-code-name mime-library-product) "\"")))
 
@@ -266,15 +266,15 @@
 ;;;
 
 (defmacro mm-expand-class-name (type)
-  `(intern (format "mime-%s-entity" ,type)))
+  (` (intern (format "mime-%s-entity" (, 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)
-                                       )
-                                     parents)
-                             '(mime-entity))))
+  (` (luna-define-class (, (mm-expand-class-name type))
+                       (, (nconc (mapcar (lambda (parent)
+                                           (mm-expand-class-name parent)
+                                           )
+                                         parents)
+                                 '(mime-entity))))))
 
 (defmacro mm-define-method (name args &rest body)
   (or (eq name 'initialize-instance)
@@ -284,7 +284,7 @@
          (cons (list (car spec)
                      (mm-expand-class-name (nth 1 spec)))
                (cdr args)))
-    `(luna-define-method ,name ,args ,@body)
+    (` (luna-define-method (, name) (, args) (,@ body)))
     ))
 
 (put 'mm-define-method 'lisp-indent-function 'defun)
@@ -331,16 +331,17 @@ message/rfc822, `mime-entity' structures of them are included in
   "Define NAME as a service for Content-Transfer-Encodings.
 If ARGS is specified, NAME is defined as a generic function for the
 service."
-  `(progn
-     (add-to-list 'mel-service-list ',name)
-     (defvar ,(intern (format "%s-obarray" name)) (make-vector 7 0))
-     ,@(if args
-          `((defun ,name ,args
-              ,@rest
-              (funcall (mel-find-function ',name ,(car (last args)))
-                       ,@(luna-arglist-to-arguments (butlast args)))
-              )))
-     ))
+  (` (progn
+       (add-to-list 'mel-service-list '(, name))
+       (defvar (, (intern (format "%s-obarray" name))) (make-vector 7 0))
+       (,@ (if args
+              (` ((defun (, name) (, args)
+                    (,@ rest)
+                    (funcall (mel-find-function '(, name)
+                                                (, (car (last args))))
+                             (,@ (luna-arglist-to-arguments (butlast args))))
+                    )))))
+       )))
 
 (put 'mel-define-service 'lisp-indent-function 'defun)
 
@@ -382,7 +383,7 @@ If PARENTS is specified, TYPE inherits PARENTS.
 Each parent must be backend name (string)."
   (cons 'progn
        (mapcar (lambda (parent)
-                 `(mel-copy-backend ,parent ,type)
+                 (` (mel-copy-backend (, parent) (, type)))
                  )
                parents)))
 
@@ -393,11 +394,11 @@ specialized parameter.  (car (car (last ARGS))) is name of variable
 and (nth 1 (car (last ARGS))) is name of backend (encoding)."
   (let* ((specializer (car (last args)))
         (class (nth 1 specializer)))
-    `(progn
-       (mel-define-service ,name)
-       (fset (intern ,class ,(intern (format "%s-obarray" name)))
-            (lambda ,(butlast args)
-              ,@body)))))
+    (` (progn
+        (mel-define-service (, name))
+        (fset (intern (, class) (, (intern (format "%s-obarray" name))))
+              (lambda (, (butlast args))
+                (,@ body)))))))
 
 (put 'mel-define-method 'lisp-indent-function 'defun)
 
@@ -411,21 +412,21 @@ variable and (nth 1 (car (last ARGS))) is name of backend (encoding)."
         (args (cdr spec))
         (specializer (car (last args)))
         (class (nth 1 specializer)))
-    `(let (sym)
-       (mel-define-service ,name)
-       (setq sym (intern ,class ,(intern (format "%s-obarray" name))))
-       (or (fboundp sym)
-          (fset sym (symbol-function ,function))))))
+    (` (let (sym)
+        (mel-define-service (, name))
+        (setq sym (intern (, class) (, (intern (format "%s-obarray" name)))))
+        (or (fboundp sym)
+            (fset sym (symbol-function (, function))))))))
 
 (defmacro mel-define-function (function spec)
   (let* ((name (car spec))
         (args (cdr spec))
         (specializer (car (last args)))
         (class (nth 1 specializer)))
-    `(progn
-       (define-function ,function
-        (intern ,class ,(intern (format "%s-obarray" name))))
-       )))
+    (` (progn
+        (define-function (, function)
+          (intern (, class) (, (intern (format "%s-obarray" name)))))
+        ))))
 
 (defvar base64-dl-module
   (if (and (fboundp 'base64-encode-string)