* wl-address.el (wl-address-make-completion-list): Do not enclose

address by " <" and ">" if associated realname is "".
* wl-addrmgr.el (wl-addrmgr-mark-check): Ditto.
This is against the promblem with group list in .addresses pointed
out by Tomotaka SUWA <cooper@saitama.fujimic.fujisankei-g.co.jp>.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index f3b1e03..73b5aaf 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-20  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-address.el (wl-address-make-completion-list): Do not enclose
+       address by " <" and ">" if associated realname is "".
+       * wl-addrmgr.el (wl-addrmgr-mark-check): Ditto.
+       This is against the promblem with group list in .addresses pointed
+       out by Tomotaka SUWA <cooper@saitama.fujimic.fujisankei-g.co.jp>.
+
 2002-01-19  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
        * wl-draft.el (wl-draft-write-sendlog): The first argument of

diff --git a/wl/wl-address.el b/wl/wl-address.el
index a2651a9..2044dc3 100644 (file)
--- a/wl/wl-address.el
+++ b/wl/wl-address.el
@@ -287,12 +287,14 @@ Matched address lists are append to CL."
     (while address-list
       (setq addr-tuple (car address-list))
       (setq cl
-            (cons
-             (cons (nth 0 addr-tuple)
-                   (concat
-                    (wl-address-quote-specials
-                     (nth 2 addr-tuple)) " <"(nth 0 addr-tuple)">"))
-             cl))
+           (cons
+            (cons (nth 0 addr-tuple)
+                  (if (string= (nth 2 addr-tuple) "")
+                      (nth 0 addr-tuple)
+                    (concat
+                     (wl-address-quote-specials
+                      (nth 2 addr-tuple)) " <"(nth 0 addr-tuple)">")))
+            cl))
       ;; nickname completion.
       (unless (or (equal (nth 1 addr-tuple) (nth 0 addr-tuple))
                  ;; already exists
@@ -300,9 +302,11 @@ Matched address lists are append to CL."
        (setq cl
              (cons
               (cons (nth 1 addr-tuple)
-                    (concat
-                     (wl-address-quote-specials
-                      (nth 2 addr-tuple)) " <"(nth 0 addr-tuple)">"))
+                    (if (string= (nth 2 addr-tuple) "")
+                        (nth 0 addr-tuple)
+                      (concat
+                       (wl-address-quote-specials
+                        (nth 2 addr-tuple)) " <"(nth 0 addr-tuple)">")))
               cl)))
       (setq address-list (cdr address-list)))
     cl))

diff --git a/wl/wl-addrmgr.el b/wl/wl-addrmgr.el
index d4e8480..4714a90 100644 (file)
--- a/wl/wl-addrmgr.el
+++ b/wl/wl-addrmgr.el
@@ -577,23 +577,29 @@ Return nil if no ADDRESS exists."
        (setq realname (nth 2 (wl-addrmgr-address-entry)))
        (cond
         ((string= mark "To:")
-         (setq to-list (cons (if full (concat
-                                       (wl-address-quote-specials realname)
-                                       " <" addr">")
-                               addr)
-                             to-list)))
+         (setq to-list (cons
+                        (if (and full (not (string= realname "")))
+                            (concat
+                             (wl-address-quote-specials realname)
+                             " <" addr">")
+                          addr)
+                        to-list)))
         ((string= mark "Cc:")
-         (setq cc-list (cons (if full (concat
-                                       (wl-address-quote-specials realname)
-                                       " <" addr">")
-                               addr)
-                             cc-list)))
+         (setq cc-list (cons
+                        (if (and full (not (string= realname "")))
+                            (concat
+                             (wl-address-quote-specials realname)
+                             " <" addr">")
+                          addr)
+                        cc-list)))
         ((string= mark "Bcc:")
-         (setq bcc-list (cons (if full (concat
-                                        (wl-address-quote-specials realname)
-                                        " <" addr">")
-                                addr)
-                              bcc-list)))))
+         (setq bcc-list (cons
+                         (if (and full (not (string= realname "")))
+                             (concat
+                              (wl-address-quote-specials realname)
+                              " <" addr">")
+                           addr)
+                         bcc-list)))))
       (list to-list cc-list bcc-list))))
 
 (defun wl-addrmgr-apply-exec (rcpt)