* wl-util.el: Move (eval-when-compile (require 'static)).

[elisp/wanderlust.git] / utils / wl-addrbook.el

diff --git a/utils/wl-addrbook.el b/utils/wl-addrbook.el
index 36f80fd..5a8c3a9 100644 (file)
--- a/utils/wl-addrbook.el
+++ b/utils/wl-addrbook.el
@@ -100,8 +100,8 @@ If nil,  the old 'user' entry remains.")
 
 ;; hash table for wl-addrbook-alist
 (defmacro wl-addrbook-hashtb ()
-  (` (or wl-addrbook-hashtb
-        (setq wl-addrbook-hashtb (elmo-make-hash 1021)))))
+  '(or wl-addrbook-hashtb
+       (setq wl-addrbook-hashtb (elmo-make-hash 1021))))
 
 (defsubst wl-addrbook-get-record-by-addr (addr &optional alist)
   (elmo-get-hash-val (downcase addr) (wl-addrbook-hashtb)))
@@ -137,7 +137,7 @@ If nil,  the old 'user' entry remains.")
   (setq wl-address-init-function 'wl-addrbook-init)
   ;;
   (when wl-summary-use-addrbook-from-func
-    (setq wl-summary-from-function 'wl-summary-addrbook-from))
+    (setq wl-summary-get-petname-function 'wl-addrbook-get-nickname))
   (define-key wl-summary-mode-map "\C-c\C-a" 'wl-summary-addrbook-add)
   (define-key wl-draft-mode-map "\C-i"     'wl-draft-addrbook-header-comp-or-tab)
   (define-key wl-draft-mode-map "\e\t"     'wl-draft-addrbook-expand)
@@ -180,10 +180,10 @@ If nil,  the old 'user' entry remains.")
 ;;
 
 (defmacro wl-alias-get (key)
-  (` (wl-addrbook-alias-get (, key) wl-addrbook-alist)))
+  `(wl-addrbook-alias-get ,key wl-addrbook-alist))
 
 (defmacro wl-alias-next (key)
-  (` (wl-addrbook-alias-next (, key) wl-addrbook-alist)))
+  `(wl-addrbook-alias-next ,key wl-addrbook-alist))
 
 (defalias 'wl-addrbook-alias-hit 'wl-addrbook-get-record-by-alias)