From: kaoru <kaoru>
Date: Fri, 15 Feb 2008 14:10:39 +0000 (+0000)
Subject: * wl-score.el (wl-score-put-alike): Use quote instead of backquote.
X-Git-Tag: wl-2_15_6-fixes~51
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b17ebfdc87655bca5937f38e9ae3a5d9e2eddf34;p=elisp%2Fwanderlust.git

* wl-score.el (wl-score-put-alike): Use quote instead of backquote.
(wl-score-get-alike): Ditto.

* wl-vars.el: New backquote style.
(wl-message-header-button-alist): Use quote instead of backquote.

* wl.el (wl-plugged-string): New backquote style.

* wl-address.el (wl-address-concat-token): New backquote style.

* wl-expire.el (wl-expire-make-sortable-date): New backquote style.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 86f02d2..b4fe30a 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,17 @@
+2008-02-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* wl-score.el (wl-score-put-alike): Use quote instead of backquote.
+	(wl-score-get-alike): Ditto.
+
+	* wl-vars.el: New backquote style.
+	(wl-message-header-button-alist): Use quote instead of backquote.
+
+	* wl.el (wl-plugged-string): New backquote style.
+
+	* wl-address.el (wl-address-concat-token): New backquote style.
+
+	* wl-expire.el (wl-expire-make-sortable-date): New backquote style.
+
 2008-02-13  Tetsurou Okazaki  <okazaki@be.to>
 
 	* wl-highlight.el (wl-highlight-folder-opened-regexp)
diff --git a/wl/wl-address.el b/wl/wl-address.el
index 2d9f845..49f8f91 100644
--- a/wl/wl-address.el
+++ b/wl/wl-address.el
@@ -620,13 +620,13 @@ Deletion is done by using `elmo-list-delete'."
 			   list))))))
 
 (defmacro wl-address-concat-token (string token)
-  (` (cond
-      ((eq 'quoted-string (car (, token)))
-       (concat (, string) "\"" (cdr (, token)) "\""))
-      ((eq 'comment (car (, token)))
-       (concat (, string) "(" (cdr (, token)) ")"))
-      (t
-       (concat (, string) (cdr (, token)))))))
+  `(cond
+    ((eq 'quoted-string (car ,token))
+     (concat ,string "\"" (cdr ,token) "\""))
+    ((eq 'comment (car (, token)))
+     (concat ,string "(" (cdr ,token) ")"))
+    (t
+     (concat ,string (cdr ,token)))))
 
 (defun wl-address-string-without-group-list-contents (sequence)
   "Return address string from lexical analyzed list SEQUENCE.
diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index aff3a26..d687c95 100644
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -73,10 +73,10 @@
 	 (error "Invalid marks: %s" wl-summary-expire-reserve-marks))))
 
 (defmacro wl-expire-make-sortable-date (date)
-  (` (timezone-make-sortable-date
-      (aref (, date) 0) (aref (, date) 1) (aref (, date) 2)
-      (timezone-make-time-string
-       (aref (, date) 3) (aref (, date) 4) (aref (, date) 5)))))
+  `(timezone-make-sortable-date
+    (aref ,date 0) (aref ,date 1) (aref ,date 2)
+    (timezone-make-time-string
+     (aref ,date 3) (aref ,date 4) (aref ,date 5))))
 
 ;; New functions to avoid accessing to the msgdb directly.
 (defsubst wl-expire-message-p (folder number)
diff --git a/wl/wl-score.el b/wl/wl-score.el
index 1dc8aad..d598bdf 100644
--- a/wl/wl-score.el
+++ b/wl/wl-score.el
@@ -538,13 +538,13 @@ Set `wl-score-cache' nil."
     nil))
 
 (defmacro wl-score-put-alike ()
-  (` (elmo-set-hash-val (format "#%d" (wl-count-lines))
-			alike
-			wl-score-alike-hashtb)))
+  '(elmo-set-hash-val (format "#%d" (wl-count-lines))
+		      alike
+		      wl-score-alike-hashtb))
 
 (defmacro wl-score-get-alike ()
-  (` (elmo-get-hash-val (format "#%d" (wl-count-lines))
-			wl-score-alike-hashtb)))
+  '(elmo-get-hash-val (format "#%d" (wl-count-lines))
+		      wl-score-alike-hashtb))
 
 (defun wl-score-insert-header (header messages &optional extra-header)
   (let ((mime-decode (nth 3 (assoc header wl-score-header-index)))
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index f00b8dd..dea7a78 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -41,12 +41,12 @@
 (defgroup wl nil
   "Wanderlust, a news and mail reading software."
   :tag "Wanderlust"
-  :link (` (custom-manual
-	    (, (if (and (boundp 'current-language-environment)
-			(string-equal "Japanese"
-				      (symbol-value 'current-language-environment)))
-		   "(wl-ja)Top"
-		 "(wl)Top"))))
+  :link `(custom-manual
+	  ,(if (and (boundp 'current-language-environment)
+		    (string-equal "Japanese"
+				  (symbol-value 'current-language-environment)))
+	       "(wl-ja)Top"
+	     "(wl)Top"))
   :group 'news
   :group 'mail)
 
@@ -1774,12 +1774,12 @@ This variable overwhelm `wl-message-ignored-field-list' settings."
   :group 'wl-setting)
 
 (defcustom wl-message-header-button-alist
-  (` (("^\\(References\\|Message-Id\\|In-Reply-To\\):"
-       "<[^>\n ]+>"
-       0 wl-message-button-refer-article  0)
-      ("^[^:]+:"
-       "\\(<\\(url: \\)?news:\\([^>\n ]*\\)>\\)"
-       1 wl-message-button-refer-article 3)))
+  '(("^\\(References\\|Message-Id\\|In-Reply-To\\):"
+     "<[^>\n ]+>"
+     0 wl-message-button-refer-article  0)
+    ("^[^:]+:"
+     "\\(<\\(url: \\)?news:\\([^>\n ]*\\)>\\)"
+     1 wl-message-button-refer-article 3))
   "Alist of headers and regexps to match buttons in message headers."
   :type '(repeat
 	  (list (regexp :tag "Header")
diff --git a/wl/wl.el b/wl/wl.el
index 3732d94..d1db27a 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -41,7 +41,7 @@
   (defmacro defgroup (&rest args))
   (defmacro defcustom (symbol value &optional doc &rest args)
     (let ((doc (concat "*" (or doc ""))))
-      (` (defvar (, symbol) (, value) (, doc))))))
+      `(defvar ,symbol ,value ,doc))))
 
 (require 'wl-vars)
 (require 'wl-util)
@@ -216,8 +216,10 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
   (run-hooks 'wl-plugged-mode-hook))
 
 (defmacro wl-plugged-string (plugged &optional time)
-  (` (if (, time) wl-plugged-auto-off
-       (if (, plugged) wl-plugged-plug-on wl-plugged-plug-off))))
+  `(if ,time wl-plugged-auto-off
+     (if ,plugged
+	 wl-plugged-plug-on
+       wl-plugged-plug-off)))
 
 (defmacro wl-plugged-server-indent ()
   '(make-string wl-plugged-server-indent ? ))