* elmo-dop.el (elmo-make-dop-queue): New backquote style.

(elmo-dop-queue-fname, elmo-dop-queue-method): Ditto.
(elmo-dop-queue-arguments): Ditto.

* elmo-date.el (elmo-match-substring): New backquote style.
(elmo-match-string, elmo-match-buffer): Ditto.
(elmo-date-make-sortable-string): Ditto.

* elmo-archive.el (elmo-archive-get-method):New backquote style.
(elmo-archive-get-suffix, elmo-archive-get-regexp): Ditto.

* elmo-multi.el (elmo-multi-real-folder-number): New backquote style.

* elmo-net.el (elmo-network-stream-type-spec-string): New backquote style.
(elmo-network-stream-type-symbol): Ditto.
(elmo-network-stream-type-feature): Ditto.
(elmo-network-stream-type-function): Ditto.
(elmo-network-session-buffer): Ditto.

* elmo-util.el (elmo-file-cache-expand-path): New backquote style.
(elmo-file-cache-status, elmo-file-cache-path): Ditto.
(elmo-make-file-cache, elmo-string, elmo-get-passwd): Ditto.
(elmo-bind-directory, elmo-set-work-buf): Ditto.

* elmo.el (elmo-folder-send): New backquote style.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index a125bdf..aff726b 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,33 @@
+2008-02-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * elmo-dop.el (elmo-make-dop-queue): New backquote style.
+       (elmo-dop-queue-fname, elmo-dop-queue-method): Ditto.
+       (elmo-dop-queue-arguments): Ditto.
+
+       * elmo-date.el (elmo-match-substring): New backquote style.
+       (elmo-match-string, elmo-match-buffer): Ditto.
+       (elmo-date-make-sortable-string): Ditto.
+
+       * elmo-archive.el (elmo-archive-get-method):New backquote style.
+       (elmo-archive-get-suffix, elmo-archive-get-regexp): Ditto.
+
+       * elmo-multi.el (elmo-multi-real-folder-number): New backquote
+       style.
+
+       * elmo-net.el (elmo-network-stream-type-spec-string): New
+       backquote style.
+       (elmo-network-stream-type-symbol): Ditto.
+       (elmo-network-stream-type-feature): Ditto.
+       (elmo-network-stream-type-function): Ditto.
+       (elmo-network-session-buffer): Ditto.
+
+       * elmo-util.el (elmo-file-cache-expand-path): New backquote style.
+       (elmo-file-cache-status, elmo-file-cache-path): Ditto.
+       (elmo-make-file-cache, elmo-string, elmo-get-passwd): Ditto.
+       (elmo-bind-directory, elmo-set-work-buf): Ditto.
+
+       * elmo.el (elmo-folder-send): New backquote style.
+
 2008-02-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * pldap.el (ldap-static-if): New backquote style.

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index 9f24c29..6abaf2a 100644 (file)
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -255,16 +255,13 @@
 
 ;;; Macro
 (defmacro elmo-archive-get-method (type action)
-  (` (cdr (assq (, action) (cdr (assq (, type)
-                                     elmo-archive-method-alist))))))
+  `(cdr (assq ,action (cdr (assq ,type elmo-archive-method-alist)))))
 
 (defmacro elmo-archive-get-suffix (type)
-  (` (cdr (assq (, type)
-               elmo-archive-suffix-alist))))
+  `(cdr (assq ,type elmo-archive-suffix-alist)))
 
 (defmacro elmo-archive-get-regexp (type)
-  (` (cdr (assq (, type)
-               elmo-archive-file-regexp-alist))))
+  `(cdr (assq ,type elmo-archive-file-regexp-alist)))
 
 (defsubst elmo-archive-call-process (prog args &optional output)
   (= (apply 'call-process prog nil output nil args) 0))

diff --git a/elmo/elmo-date.el b/elmo/elmo-date.el
index 1f330fa..b2dfb65 100644 (file)
--- a/elmo/elmo-date.el
+++ b/elmo/elmo-date.el
@@ -36,18 +36,18 @@
 
 (defmacro elmo-match-substring (pos string from)
   "Substring of POSth matched string of STRING."
-  (` (substring (, string)
-               (+ (match-beginning (, pos)) (, from))
-               (match-end (, pos)))))
+  `(substring ,string
+             (+ (match-beginning ,pos) ,from)
+             (match-end ,pos)))
 
 (defmacro elmo-match-string (pos string)
   "Substring POSth matched STRING."
-  (` (substring (, string) (match-beginning (, pos)) (match-end (, pos)))))
+  `(substring ,string (match-beginning ,pos) (match-end ,pos)))
 
 (defmacro elmo-match-buffer (pos)
   "Substring POSth matched from the current buffer."
-  (` (buffer-substring-no-properties
-      (match-beginning (, pos)) (match-end (, pos)))))
+  `(buffer-substring-no-properties
+    (match-beginning ,pos) (match-end ,pos)))
 
 ;; from subr.el
 (defun elmo-replace-in-string (str regexp newtext &optional literal)
@@ -202,14 +202,14 @@ Otherwise treat \\ in NEWTEXT string as special:
 
 (defmacro elmo-date-make-sortable-string (datevec)
   "Make a sortable string from DATEVEC."
-  (` (timezone-make-sortable-date
-      (aref (, datevec) 0)
-      (aref (, datevec) 1)
-      (aref (, datevec) 2)
-      (timezone-make-time-string
-       (aref (, datevec) 3)
-       (aref (, datevec) 4)
-       (aref (, datevec) 5)))))
+  `(timezone-make-sortable-date
+    (aref ,datevec 0)
+    (aref ,datevec 1)
+    (aref ,datevec 2)
+    (timezone-make-time-string
+     (aref ,datevec 3)
+     (aref ,datevec 4)
+     (aref ,datevec 5))))
 
 (defsubst elmo-datevec-to-time (datevec)
   (encode-time (aref datevec 5) (aref datevec 4) (aref datevec 3)

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index 3c2d28d..e124b68 100644 (file)
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -43,19 +43,19 @@ Automatically loaded/saved.")
 
 (defmacro elmo-make-dop-queue (fname method arguments)
   "Make a dop queue."
-  (` (vector (, fname) (, method) (, arguments))))
+  `(vector ,fname ,method ,arguments))
 
 (defmacro elmo-dop-queue-fname (queue)
   "Return the folder name string of the QUEUE."
-  (` (aref (, queue) 0)))
+  `(aref ,queue 0))
 
 (defmacro elmo-dop-queue-method (queue)
   "Return the method symbol of the QUEUE."
-  (` (aref (, queue) 1)))
+  `(aref ,queue 1))
 
 (defmacro elmo-dop-queue-arguments (queue)
   "Return the arguments of the QUEUE."
-  (` (aref (, queue) 2)))
+  `(aref ,queue 2))
 
 (defun elmo-dop-queue-append (folder method arguments)
   "Append to disconnected operation queue."

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 880310c..c95d4ab 100644 (file)
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -45,12 +45,12 @@
 
 (defmacro elmo-multi-real-folder-number (folder number)
   "Returns a cons cell of real FOLDER and NUMBER."
-  (` (cons (nth (-
-                (/ (, number)
-                   (elmo-multi-folder-divide-number-internal (, folder)))
-                1) (elmo-multi-folder-children-internal (, folder)))
-          (% (, number) (elmo-multi-folder-divide-number-internal
-                         (, folder))))))
+  `(cons (nth (-
+              (/ ,number
+                 (elmo-multi-folder-divide-number-internal ,folder))
+              1) (elmo-multi-folder-children-internal ,folder))
+        (% ,number (elmo-multi-folder-divide-number-internal
+                    ,folder))))
 
 (luna-define-method elmo-folder-initialize ((folder
                                             elmo-multi-folder)

diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index c1f1bdb..df30cb1 100644 (file)
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -121,16 +121,16 @@ If nil, just once. If t, until success."
     (delete-process (elmo-network-session-process-internal session))))
 
 (defmacro elmo-network-stream-type-spec-string (stream-type)
-  (` (nth 0 (, stream-type))))
+  `(nth 0 ,stream-type))
 
 (defmacro elmo-network-stream-type-symbol (stream-type)
-  (` (nth 1 (, stream-type))))
+  `(nth 1 ,stream-type))
 
 (defmacro elmo-network-stream-type-feature (stream-type)
-  (` (nth 2 (, stream-type))))
+  `(nth 2 ,stream-type))
 
 (defmacro elmo-network-stream-type-function (stream-type)
-  (` (nth 3 (, stream-type))))
+  `(nth 3 ,stream-type))
 
 (defsubst elmo-network-session-password-key (session)
   (format "%s:%s/%s@%s:%d"
@@ -175,8 +175,7 @@ If nil, just once. If t, until success."
 
 (defmacro elmo-network-session-buffer (session)
   "Get buffer for SESSION."
-  (` (process-buffer (elmo-network-session-process-internal
-                     (, session)))))
+  `(process-buffer (elmo-network-session-process-internal ,session)))
 
 (defun elmo-network-get-session (class name folder &optional if-exists)
   "Get network session from session cache or a new network session.

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index e8eb757..d99b47a 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -68,19 +68,19 @@
 
 (defmacro elmo-set-work-buf (&rest body)
   "Execute BODY on work buffer.  Work buffer remains."
-  (` (save-excursion
-       (set-buffer (get-buffer-create elmo-work-buf-name))
-       (set-buffer-multibyte default-enable-multibyte-characters)
-       (erase-buffer)
-       (,@ body))))
+  `(save-excursion
+     (set-buffer (get-buffer-create elmo-work-buf-name))
+     (set-buffer-multibyte default-enable-multibyte-characters)
+     (erase-buffer)
+     ,@body))
 
 (put 'elmo-set-work-buf 'lisp-indent-function 0)
 (def-edebug-spec elmo-set-work-buf t)
 
 (defmacro elmo-bind-directory (dir &rest body)
   "Set current directory DIR and execute BODY."
-  (` (let ((default-directory (file-name-as-directory (, dir))))
-       (,@ body))))
+  `(let ((default-directory (file-name-as-directory ,dir)))
+     ,@body))
 
 (put 'elmo-bind-directory 'lisp-indent-function 1)
 (def-edebug-spec elmo-bind-directory
@@ -591,7 +591,7 @@ Return value is a cons cell of (STRUCTURE . REST)"
                                (elmo-base64-encode-string pass)))))
       (if elmo-passwd-life-time
          (run-with-timer elmo-passwd-life-time nil
-                         (` (lambda () (elmo-remove-passwd (, key))))))
+                         `(lambda nil (elmo-remove-passwd ,key))))
       pass)))
 
 (defun elmo-remove-passwd (key)
@@ -1303,9 +1303,9 @@ MESSAGE is a doing part of progress message."
 
 (defmacro elmo-string (string)
   "STRING without text property."
-  (` (let ((obj (copy-sequence (, string))))
-       (and obj (set-text-properties 0 (length obj) nil obj))
-       obj)))
+  `(let ((obj (copy-sequence ,string)))
+     (and obj (set-text-properties 0 (length obj) nil obj))
+     obj))
 
 (defun elmo-flatten (list-of-list)
   "Flatten LIST-OF-LIST."
@@ -1859,15 +1859,15 @@ STATUS is one of 'section, 'entire or nil.
 'section means partial section cache exists.
 'entire means entire cache exists.
 If the cache is partial file-cache, TYPE is 'partial."
-  (` (cons (, path) (, status))))
+  `(cons ,path ,status))
 
 (defmacro elmo-file-cache-path (file-cache)
   "Returns the file path of the FILE-CACHE."
-  (` (car (, file-cache))))
+  `(car ,file-cache))
 
 (defmacro elmo-file-cache-status (file-cache)
   "Returns the status of the FILE-CACHE."
-  (` (cdr (, file-cache))))
+  `(cdr ,file-cache))
 
 (defsubst elmo-cache-to-msgid (filename)
   (concat "<" (elmo-recover-string-from-filename filename) ">"))
@@ -1904,7 +1904,7 @@ If optional argument SECTION is specified, partial cache path is returned."
   "Return file name for the file-cache corresponds to the section.
 PATH is the file-cache path.
 SECTION is the section string."
-  (` (expand-file-name (or (, section) "") (, path))))
+  `(expand-file-name (or ,section "") ,path))
 
 (defun elmo-file-cache-delete (path)
   "Delete a cache on PATH."

diff --git a/elmo/elmo.el b/elmo/elmo.el
index b1e6acb..d07638d 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -161,7 +161,7 @@ If a folder name begins with PREFIX, use BACKEND."
 
 (defmacro elmo-folder-send (folder message &rest args)
   "Let FOLDER receive the MESSAGE with ARGS."
-  (` (luna-send (, folder) (, message) (, folder) (,@ args))))
+  `(luna-send ,folder ,message ,folder ,@args))
 
 ;;;###autoload
 (defun elmo-make-folder (name &optional non-persistent mime-charset)