From ab10dc59ccf170429c9b5522ab45bc707927ffb3 Mon Sep 17 00:00:00 2001 From: teranisi Date: Tue, 24 Oct 2000 03:23:47 +0000 Subject: [PATCH] * wl-draft.el (wl-draft-parse-mailbox-list): Don't insert extra space. * wl-address.el (wl-address-string-without-group-list-contents): Fixed problem when group-list content is nothing. (Reported by Mito ) --- wl/ChangeLog | 8 ++++++++ wl/wl-address.el | 10 ++++++---- wl/wl-draft.el | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index f4abd4c..90fba91 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,11 @@ +2000-10-24 Yuuichi Teranishi + + * wl-draft.el (wl-draft-parse-mailbox-list): Don't insert extra space. + + * wl-address.el (wl-address-string-without-group-list-contents): Fixed + problem when group-list content is nothing. + (Reported by Mito ) + 2000-10-18 SAITO Atsunori * wl-summary.el (wl-summary-print-destination): Adjust line length. diff --git a/wl/wl-address.el b/wl/wl-address.el index 4d75b79..c9b55bf 100644 --- a/wl/wl-address.el +++ b/wl/wl-address.el @@ -587,7 +587,7 @@ e.g. \"Mr. bar \" (defun wl-address-string-without-group-list-contents (sequence) "Return address string from lexical analyzed list SEQUENCE. Group list contents is not included." - (let (address-string route-addr-end token seq) + (let (address-string route-addr-end token seq group-end) (while sequence (setq token (car sequence)) (cond @@ -597,10 +597,12 @@ Group list contents is not included." (setq address-string (concat address-string (cdr token))) ; ':' (setq seq (cdr sequence)) (setq token (car seq)) - (while (not (and (eq 'specials (car token)) - (string= (cdr token) ";"))) + (setq group-end nil) + (while (not group-end) (setq token (car seq)) - (setq seq (cdr seq))) + (setq seq (cdr seq)) + (setq group-end (and (eq 'specials (car token)) + (string= (cdr token) ";")))) (setq address-string (concat address-string (cdr token))) ; ';' (setq sequence seq)) ;; route-addr = "<" [route] addr-spec ">" diff --git a/wl/wl-draft.el b/wl/wl-draft.el index a217749..0a617c0 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -879,7 +879,7 @@ from current buffer." (setq addresses (cdr addresses))) (when (and remove-group-list has-group-list) (delete-region beg (point)) - (insert " " (wl-address-string-without-group-list-contents seq)))) + (insert (wl-address-string-without-group-list-contents seq)))) mailbox-list))) (defun wl-draft-deduce-address-list (buffer header-start header-end) -- 1.7.10.4