* etc/icons/*.xbm: Replaced "-" with "_" to make them can be handled by

[elisp/wanderlust.git] / wl / wl-addrmgr.el

diff --git a/wl/wl-addrmgr.el b/wl/wl-addrmgr.el
index 4452bbd..276a50f 100644 (file)
--- a/wl/wl-addrmgr.el
+++ b/wl/wl-addrmgr.el
@@ -1,4 +1,4 @@
-;;; wl-addrmgr.el -- Address manager for Wanderlust.
+;;; wl-addrmgr.el --- Address manager for Wanderlust.
 
 ;; Copyright (C) 2001 Kitamoto Tsuyoshi <tsuyoshi.kitamoto@city.sapporo.jp>
 ;; Copyright (C) 2001 Yuuichi Teranishi <teranisi@gohome.org>
@@ -87,20 +87,13 @@
   :group 'wl-addrmgr)
 
 (defcustom wl-addrmgr-default-method 'local
-  "Default access method for address entries.
-Defined by `wl-addrmgr-method-alist'."
+  "Default access method for address entries."
   :type 'symbol
   :group 'wl-addrmgr)
 
 (defvar wl-addrmgr-buffer-name "Address")
 (defvar wl-addrmgr-mode-map nil)
-
-(defvar wl-addrmgr-method-alist
-  '((local . (wl-addrmgr-local-list   ; list address entries
-             wl-addrmgr-local-add    ; add address entry
-             wl-addrmgr-local-edit   ; edit address entry
-             wl-addrmgr-local-delete ; delete address entry
-             ))))
+(defvar wl-addrmgr-method-list '(local))
 
 ;; buffer local variable.
 (defvar wl-addrmgr-draft-buffer nil)
@@ -217,7 +210,9 @@ See info under Wanderlust for full documentation.
   (interactive)
   (goto-char (point-min))
   (forward-line 2)
-  (forward-char 4))
+  (condition-case nil
+      (forward-char 4)
+    (error)))
 
 (defun wl-addrmgr-goto-bottom ()
   (interactive)
@@ -313,6 +308,7 @@ Return nil if no ADDRESS exists."
              " "
              (make-string wl-addrmgr-petname-width ?-)
              " ---------------")
+      (unless wl-addrmgr-list (insert "\n"))
       (dolist (entry (wl-addrmgr-sort-list wl-addrmgr-sort-key
                                           (copy-sequence wl-addrmgr-list)
                                           wl-addrmgr-sort-order))
@@ -451,9 +447,9 @@ Return nil if no ADDRESS exists."
                                 (completing-read
                                  (format "Method (%s): "
                                          (symbol-name wl-addrmgr-method))
-                                 (mapcar (lambda (pair)
-                                           (list (symbol-name (car pair))))
-                                         wl-addrmgr-method-alist)
+                                 (mapcar (lambda (method)
+                                           (list (symbol-name method)))
+                                         wl-addrmgr-method-list)
                                  nil t nil nil
                                  (symbol-name wl-addrmgr-method)))))
   (wl-addrmgr-redraw))
@@ -601,15 +597,9 @@ Return nil if no ADDRESS exists."
       (list to-list cc-list bcc-list))))
 
 (defun wl-addrmgr-apply-exec (rcpt)
-  (let ((to (nconc (nth 0 rcpt) (mapcar
-                                'cdr
-                                (cdr (assq 'to wl-addrmgr-unknown-list)))))
-       (cc (nconc (nth 1 rcpt) (mapcar
-                                'cdr
-                                (cdr (assq 'cc wl-addrmgr-unknown-list)))))
-       (bcc (nconc (nth 2 rcpt) (mapcar
-                                 'cdr
-                                 (cdr (assq 'bcc wl-addrmgr-unknown-list)))))
+  (let ((to (nconc (nth 0 rcpt) (cdr (assq 'to wl-addrmgr-unknown-list))))
+       (cc (nconc (nth 1 rcpt) (cdr (assq 'cc wl-addrmgr-unknown-list))))
+       (bcc (nconc (nth 2 rcpt) (cdr (assq 'bcc wl-addrmgr-unknown-list))))
        from clist)
     (setq clist (list (cons "Bcc" (if bcc (mapconcat 'identity bcc ",\n\t")))
                      (cons "Cc" (if cc (mapconcat 'identity cc ",\n\t")))
@@ -659,10 +649,7 @@ Return nil if no ADDRESS exists."
        (put-text-property beg end 'face nil)
        (wl-highlight-message beg end t))))
 
-;; beginning of the end
 (require 'product)
-(product-provide
-    (provide 'wl-addrmgr)
-  (require 'wl-version))
+(product-provide (provide 'wl-addrmgr) (require 'wl-version))
 
 ;;; wl-addrmgr.el ends here