* elmo-nntp.el (elmo-nntp-get-server-command)

(elmo-nntp-set-server-command, elmo-nntp-xover-p)
(elmo-nntp-listgroup-p, elmo-nntp-set-listgroup)
(elmo-nntp-list-active-p, elmo-nntp-set-list-active)
(elmo-nntp-xhdr-p, elmo-nntp-set-xhdr): New backquote style.

* elmo-imap4.el (elmo-imap4-debug)
(elmo-imap4-response-continue-req-p, elmo-imap4-response-ok-p)
(elmo-imap4-response-bye-p, elmo-imap4-response-garbage-p)
(elmo-imap4-response-value, elmo-imap4-response-error-text)
(elmo-imap4-response-bodydetail-text, elmo-imap4-value)
(elmo-imap4-nth, elmo-imap4-detect-search-charset)
(elmo-imap4-identical-system-p): New backquote style.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index aff726b..9ccacf2 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,19 @@
+2008-02-16  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * elmo-nntp.el (elmo-nntp-get-server-command)
+       (elmo-nntp-set-server-command, elmo-nntp-xover-p)
+       (elmo-nntp-listgroup-p, elmo-nntp-set-listgroup)
+       (elmo-nntp-list-active-p, elmo-nntp-set-list-active)
+       (elmo-nntp-xhdr-p, elmo-nntp-set-xhdr): New backquote style.
+
+       * elmo-imap4.el (elmo-imap4-debug)
+       (elmo-imap4-response-continue-req-p, elmo-imap4-response-ok-p)
+       (elmo-imap4-response-bye-p, elmo-imap4-response-garbage-p)
+       (elmo-imap4-response-value, elmo-imap4-response-error-text)
+       (elmo-imap4-response-bodydetail-text, elmo-imap4-value)
+       (elmo-imap4-nth, elmo-imap4-detect-search-charset)
+       (elmo-imap4-identical-system-p): New backquote style.
+
 2008-02-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * elmo-dop.el (elmo-make-dop-queue): New backquote style.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index e650516..91522d0 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -210,8 +210,8 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"")
 
 ;;; Debug
 (defmacro elmo-imap4-debug (message &rest args)
-  (` (if elmo-imap4-debug
-        (elmo-imap4-debug-1 (, message) (,@ args)))))
+  `(if elmo-imap4-debug
+       (elmo-imap4-debug-1 ,message ,@args)))
 
 (defun elmo-imap4-debug-1 (message &rest args)
   (with-current-buffer (get-buffer-create "*IMAP4 DEBUG*")
@@ -234,23 +234,23 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"")
 
 (defmacro elmo-imap4-response-continue-req-p (response)
   "Returns non-nil if RESPONSE is '+' response."
-  (` (assq 'continue-req (, response))))
+  `(assq 'continue-req ,response))
 
 (defmacro elmo-imap4-response-ok-p (response)
   "Returns non-nil if RESPONSE is an 'OK' response."
-  (` (assq 'ok (, response))))
+  `(assq 'ok ,response))
 
 (defmacro elmo-imap4-response-bye-p (response)
   "Returns non-nil if RESPONSE is an 'BYE' response."
-  (` (assq 'bye (, response))))
+  `(assq 'bye ,response))
 
 (defmacro elmo-imap4-response-garbage-p (response)
   "Returns non-nil if RESPONSE is an 'garbage' response."
-  (` (assq 'garbage (, response))))
+  `(assq 'garbage ,response))
 
 (defmacro elmo-imap4-response-value (response symbol)
   "Get value of the SYMBOL from RESPONSE."
-  (` (nth 1 (assq (, symbol) (, response)))))
+  `(nth 1 (assq ,symbol ,response)))
 
 (defsubst elmo-imap4-response-value-all (response symbol)
   "Get all value of the SYMBOL from RESPONSE."
@@ -263,13 +263,13 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"")
 
 (defmacro elmo-imap4-response-error-text (response)
   "Returns text of NO, BAD, BYE response."
-  (` (nth 1 (or (elmo-imap4-response-value (, response) 'no)
-               (elmo-imap4-response-value (, response) 'bad)
-               (elmo-imap4-response-value (, response) 'bye)))))
+  `(nth 1 (or (elmo-imap4-response-value ,response 'no)
+             (elmo-imap4-response-value ,response 'bad)
+             (elmo-imap4-response-value ,response 'bye))))
 
 (defmacro elmo-imap4-response-bodydetail-text (response)
   "Returns text of BODY[section]<partial>."
-  (` (nth 3 (assq 'bodydetail (, response)))))
+  `(nth 3 (assq 'bodydetail ,response)))
 
 ;;; Session commands.
 
@@ -1630,12 +1630,13 @@ Return nil if no complete line has arrived."
 
 
 (defmacro elmo-imap4-value (value)
-  (` (if (eq (, value) 'NIL) nil
-       (, value))))
+  `(if (eq ,value 'NIL)
+       nil
+     ,value))
 
 (defmacro elmo-imap4-nth (pos list)
-  (` (let ((value (nth (, pos) (, list))))
-       (elmo-imap4-value value))))
+  `(let ((value (nth ,pos ,list)))
+     (elmo-imap4-value value)))
 
 (defun elmo-imap4-parse-namespace ()
   (list 'namespace
@@ -2209,9 +2210,9 @@ If optional argument REMOVE is non-nil, remove FLAG."
     t))
 
 (defmacro elmo-imap4-detect-search-charset (string)
-  (` (with-temp-buffer
-       (insert (, string))
-       (detect-mime-charset-region (point-min) (point-max)))))
+  `(with-temp-buffer
+     (insert ,string)
+     (detect-mime-charset-region (point-min) (point-max))))
 
 (defun elmo-imap4-search-internal-primitive (folder session filter from-msgs)
   (let ((search-key (elmo-filter-key filter))
@@ -2638,12 +2639,12 @@ If optional argument REMOVE is non-nil, remove FLAG."
 (eval-when-compile
   (defmacro elmo-imap4-identical-system-p (folder1 folder2)
     "Return t if FOLDER1 and FOLDER2 are in the same IMAP4 system."
-    (` (and (string= (elmo-net-folder-server-internal (, folder1))
-                    (elmo-net-folder-server-internal (, folder2)))
-           (eq (elmo-net-folder-port-internal (, folder1))
-               (elmo-net-folder-port-internal (, folder2)))
-           (string= (elmo-net-folder-user-internal (, folder1))
-                    (elmo-net-folder-user-internal (, folder2)))))))
+    `(and (string= (elmo-net-folder-server-internal ,folder1)
+                  (elmo-net-folder-server-internal ,folder2))
+         (eq (elmo-net-folder-port-internal ,folder1)
+             (elmo-net-folder-port-internal ,folder2))
+         (string= (elmo-net-folder-user-internal ,folder1)
+                  (elmo-net-folder-user-internal ,folder2)))))
 
 (luna-define-method elmo-folder-next-message-number-plugged
   ((folder elmo-imap4-folder))

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 3835737..ae1d23b 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -181,69 +181,69 @@ Don't cache if nil.")
                                           (xhdr . 3)))
 
 (defmacro elmo-nntp-get-server-command (session)
-  (` (assoc (cons (elmo-network-session-server-internal (, session))
-                 (elmo-network-session-port-internal (, session)))
-           elmo-nntp-server-command-alist)))
+  `(assoc (cons (elmo-network-session-server-internal ,session)
+               (elmo-network-session-port-internal ,session))
+         elmo-nntp-server-command-alist))
 
 (defmacro elmo-nntp-set-server-command (session com value)
-  (` (let (entry)
-       (unless (setq entry (cdr (elmo-nntp-get-server-command
-                                (, session))))
-        (setq elmo-nntp-server-command-alist
-              (nconc elmo-nntp-server-command-alist
-                     (list (cons
-                            (cons
-                             (elmo-network-session-server-internal (, session))
-                             (elmo-network-session-port-internal (, session)))
-                            (setq entry
-                                  (vector
-                                   elmo-nntp-default-use-xover
-                                   elmo-nntp-default-use-listgroup
-                                   elmo-nntp-default-use-list-active
-                                   elmo-nntp-default-use-xhdr)))))))
-       (aset entry
-            (cdr (assq (, com) elmo-nntp-server-command-index))
-            (, value)))))
+  `(let (entry)
+     (unless (setq entry (cdr (elmo-nntp-get-server-command
+                              ,session)))
+       (setq elmo-nntp-server-command-alist
+            (nconc elmo-nntp-server-command-alist
+                   (list (cons
+                          (cons
+                           (elmo-network-session-server-internal ,session)
+                           (elmo-network-session-port-internal ,session))
+                          (setq entry
+                                (vector
+                                 elmo-nntp-default-use-xover
+                                 elmo-nntp-default-use-listgroup
+                                 elmo-nntp-default-use-list-active
+                                 elmo-nntp-default-use-xhdr)))))))
+     (aset entry
+          (cdr (assq ,com elmo-nntp-server-command-index))
+          ,value)))
 
 (defmacro elmo-nntp-xover-p (session)
-  (` (let ((entry (elmo-nntp-get-server-command (, session))))
-       (if entry
-          (aref (cdr entry)
-                (cdr (assq 'xover elmo-nntp-server-command-index)))
-        elmo-nntp-default-use-xover))))
+  `(let ((entry (elmo-nntp-get-server-command ,session)))
+     (if entry
+        (aref (cdr entry)
+              (cdr (assq 'xover elmo-nntp-server-command-index)))
+       elmo-nntp-default-use-xover)))
 
 (defmacro elmo-nntp-set-xover (session value)
-  (` (elmo-nntp-set-server-command (, session) 'xover (, value))))
+  `(elmo-nntp-set-server-command ,session 'xover ,value))
 
 (defmacro elmo-nntp-listgroup-p (session)
-  (` (let ((entry (elmo-nntp-get-server-command (, session))))
-       (if entry
-          (aref (cdr entry)
-                (cdr (assq 'listgroup elmo-nntp-server-command-index)))
-        elmo-nntp-default-use-listgroup))))
+  `(let ((entry (elmo-nntp-get-server-command ,session)))
+     (if entry
+        (aref (cdr entry)
+              (cdr (assq 'listgroup elmo-nntp-server-command-index)))
+       elmo-nntp-default-use-listgroup)))
 
 (defmacro elmo-nntp-set-listgroup (session value)
-  (` (elmo-nntp-set-server-command (, session) 'listgroup (, value))))
+  `(elmo-nntp-set-server-command ,session 'listgroup ,value))
 
 (defmacro elmo-nntp-list-active-p (session)
-  (` (let ((entry (elmo-nntp-get-server-command (, session))))
-       (if entry
-          (aref (cdr entry)
-                (cdr (assq 'list-active elmo-nntp-server-command-index)))
-        elmo-nntp-default-use-list-active))))
+  `(let ((entry (elmo-nntp-get-server-command ,session)))
+     (if entry
+        (aref (cdr entry)
+              (cdr (assq 'list-active elmo-nntp-server-command-index)))
+       elmo-nntp-default-use-list-active)))
 
 (defmacro elmo-nntp-set-list-active (session value)
-  (` (elmo-nntp-set-server-command (, session) 'list-active (, value))))
+  `(elmo-nntp-set-server-command ,session 'list-active ,value))
 
 (defmacro elmo-nntp-xhdr-p (session)
-  (` (let ((entry (elmo-nntp-get-server-command (, session))))
-       (if entry
-          (aref (cdr entry)
-                (cdr (assq 'xhdr elmo-nntp-server-command-index)))
-        elmo-nntp-default-use-xhdr))))
+  `(let ((entry (elmo-nntp-get-server-command ,session)))
+     (if entry
+        (aref (cdr entry)
+              (cdr (assq 'xhdr elmo-nntp-server-command-index)))
+       elmo-nntp-default-use-xhdr)))
 
 (defmacro elmo-nntp-set-xhdr (session value)
-  (` (elmo-nntp-set-server-command (, session) 'xhdr (, value))))
+  `(elmo-nntp-set-server-command ,session 'xhdr ,value))
 
 (defsubst elmo-nntp-max-number-precedes-list-active-p ()
   elmo-nntp-max-number-precedes-list-active)