* eword-encode.el (eword-encode-mailboxes-to-rword-list): New inline function.

(eword-encode-address-to-rword-list): Ditto.
(eword-encode-addresses-to-rword-list):
Use `eword-encode-address-to-rword-list' instead of
`eword-encode-mailbox-to-rword-list'.

* std11.el (std11-address-string): Fix for group list.

diff --git a/ChangeLog b/ChangeLog
index 62a2d65..5726824 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-08-28  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * eword-encode.el (eword-encode-mailboxes-to-rword-list):
+       New inline function.
+       (eword-encode-address-to-rword-list): Ditto.
+       (eword-encode-addresses-to-rword-list):
+       Use `eword-encode-address-to-rword-list' instead of
+       `eword-encode-mailbox-to-rword-list'.
+
+       * std11.el (std11-address-string): Fix for group list.
+
 2000-08-10  MORIOKA Tomohiko  <tomo@m17n.org>
 
        * mmgeneric.el: Enclose definition of class `mime-entity' and its
@@ -8,7 +19,7 @@
 \f
 2000-07-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
-       * FLIM-Chao: Version 1.14.1 (Rokujiz\e-Dò)\e-A released.
+       * FLIM-Chao: Version 1.14.1 (Rokujiz\e-Dò) released.\e-A
 
 2000-07-10  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
@@ -626,7 +637,7 @@
 \f
 1999-05-31  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * FLIM: Version 1.12.7 (Y\e-Dþzaki)\e-A released.
+       * FLIM: Version 1.12.7 (Y\e-Dþzaki) released.\e-A
 
 1999-05-31  MORIOKA Tomohiko  <tomo@m17n.org>
 
@@ -801,7 +812,7 @@
 \f
 1999-05-11  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * FLIM: Version 1.12.6 (Family-K\e-Dòenmae)\e-A released.
+       * FLIM: Version 1.12.6 (Family-K\e-Dòenmae) released.\e-A
 
 1999-04-27  Shuhei KOBAYASHI  <shuhei@aqua.ocn.ne.jp>
 
@@ -918,7 +929,7 @@
 \f
 1999-01-23  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.12.3 (Kintetsu-K\e-Dòriyama)\e-A released.
+       * FLIM: Version 1.12.3 (Kintetsu-K\e-Dòriyama) released.\e-A
 
 1999-01-23  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -961,7 +972,7 @@
 \f
 1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.12.2 (Kuj\e-Dò)\e-A released.
+       * FLIM: Version 1.12.2 (Kuj\e-Dò) released.\e-A
 
 1999-01-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -1147,7 +1158,7 @@
 \f
 1998-12-02  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.12.1 (Nishinoky\e-Dò)\e-A released.
+       * FLIM: Version 1.12.1 (Nishinoky\e-Dò) released.\e-A
 
 1998-11-30  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -1365,7 +1376,7 @@
 \f
 1998-10-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.11.2 (Heij\e-Dò)\e-A was released.
+       * FLIM: Version 1.11.2 (Heij\e-Dò) was released.\e-A
 
        * NEWS (Abolish variable `mime-temp-directory'): New subsection.
 
@@ -1645,7 +1656,7 @@
 \f
 1998-10-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.10.4 (Shin-H\e-Dòsono)\e-A was released.
+       * FLIM: Version 1.10.4 (Shin-H\e-Dòsono) was released.\e-A
 
 1998-10-12  Katsumi Yamaoka   <yamaoka@jpl.org>
 
@@ -1830,7 +1841,7 @@
 \f
 1998-09-29  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.10.0 (K\e-Dòdo)\e-A was released.
+       * FLIM: Version 1.10.0 (K\e-Dòdo) was released.\e-A
 
        * README.en (What's FLIM): Add mel-ccl.el.
 
@@ -2117,7 +2128,7 @@
 \f
 1998-08-31  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.9.1 (Tonosh\e-Dò)\e-A was released.
+       * FLIM: Version 1.9.1 (Tonosh\e-Dò) was released.\e-A
 
        * mime-en.sgml (mm-backend): Translate a little.
 
@@ -2260,7 +2271,7 @@
 \f
 1998-07-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM-Chao: Version 1.8.0 (Shij\e-Dò)\e-A was released.
+       * FLIM-Chao: Version 1.8.0 (Shij\e-Dò) was released.\e-A
 
 1998-07-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2372,7 +2383,7 @@
 \f
 1998-07-01  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.8.0 (\e-DÒkubo)\e-A was released.
+       * FLIM: Version 1.8.0 (\e-DÒkubo) was released.\e-A
 
        * README.en: Delete `How to use'.
 
@@ -2497,7 +2508,7 @@
 \f
 1998-06-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM-Chao: Version 1.7.0 (Goj\e-Dò)\e-A was released.
+       * FLIM-Chao: Version 1.7.0 (Goj\e-Dò) was released.\e-A
 
 1998-06-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2756,7 +2767,7 @@
 \f
 1998-06-19  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.4.1 (Momoyama-Gory\e-Dòmae)\e-A was released.
+       * FLIM: Version 1.4.1 (Momoyama-Gory\e-Dòmae) was released.\e-A
 
 1998-06-18  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2876,7 +2887,7 @@
 \f
 1998-05-06  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.2.0 (J\e-Dþjò)\e-A was released.
+       * FLIM: Version 1.2.0 (J\e-Dþjò) was released.\e-A
 
        * README.en (What's FLIM): Delete description about
        std11-parse.el; add description about mailcap.el.
@@ -2927,7 +2938,7 @@
 \f
 1998-05-05  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.1.0 (T\e-Dòji)\e-A was released.
+       * FLIM: Version 1.1.0 (T\e-Dòji) was released.\e-A
 
 1998-05-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2963,7 +2974,7 @@
 \f
 1998-04-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.0.1 (Ky\e-Dòto)\e-A was released.
+       * FLIM: Version 1.0.1 (Ky\e-Dòto) was released.\e-A
 
        * mime-def.el (mime-spadework-module-version-string): New
        constant.

diff --git a/eword-encode.el b/eword-encode.el
index 5735e04..f7111c1 100644 (file)
--- a/eword-encode.el
+++ b/eword-encode.el
@@ -517,17 +517,37 @@ MODE is allows `text', `comment', `phrase' or nil.  Default value is
                      )))
     dest))
 
+(defsubst eword-encode-mailboxes-to-rword-list (mboxes)
+  (let ((dest (eword-encode-mailbox-to-rword-list (car mboxes))))
+    (if dest
+       (while (setq mboxes (cdr mboxes))
+         (setq dest
+               (nconc dest
+                      (list '("," nil nil))
+                      (eword-encode-mailbox-to-rword-list
+                       (car mboxes))))))
+    dest))
+
+(defsubst eword-encode-address-to-rword-list (address)
+  (cond
+   ((eq (car address) 'mailbox)
+    (eword-encode-mailbox-to-rword-list address))
+   ((eq (car address) 'group)
+    (nconc
+     (eword-encode-phrase-to-rword-list (nth 1 address))
+     (list (list ":" nil nil))
+     (eword-encode-mailboxes-to-rword-list (nth 2 address))
+     (list (list ";" nil nil))))))
+
 (defsubst eword-encode-addresses-to-rword-list (addresses)
-  (let ((dest (eword-encode-mailbox-to-rword-list (car addresses))))
+  (let ((dest (eword-encode-address-to-rword-list (car addresses))))
     (if dest
        (while (setq addresses (cdr addresses))
          (setq dest
                (nconc dest
                       (list '("," nil nil))
                       ;; (list '(" " nil nil))
-                      (eword-encode-mailbox-to-rword-list (car addresses))
-                      ))
-         ))
+                      (eword-encode-address-to-rword-list (car addresses))))))
     dest))
 
 (defsubst eword-encode-msg-id-to-rword-list (msg-id)

diff --git a/std11.el b/std11.el
index 982b895..dc7bde5 100644 (file)
--- a/std11.el
+++ b/std11.el
@@ -765,7 +765,7 @@ represents addr-spec of RFC 822."
   "Return string of address part from parsed ADDRESS of RFC 822."
   (cond ((eq (car address) 'group)
         (mapconcat (function std11-address-string)
-                   (car (cdr address))
+                   (nth 2 address)
                    ", ")
         )
        ((eq (car address) 'mailbox)