Applied patch from Tatsuya Kinoshita <tats@iris.ne.jp> san.

2001-11-30  Tatsuya Kinoshita  <tats@iris.ne.jp>

	* elmo-pop3.el (elmo-pop3-parse-list-response): Allow multiple
	space delimiter for list response.

2001-11-30  Tatsuya Kinoshita  <tats@iris.ne.jp>

	* wl-vars.el (wl-draft-add-references): Set default value as nil.
	(wl-draft-add-in-reply-to): New variable.
	* wl-draft.el (wl-draft-add-references, wl-draft-add-in-reply-to):
	Divided from `wl-draft-add-references'; add support `In-Reply-To'.
	(wl-draft-yank-from-mail-reply-buffer): Use
	`wl-draft-add-in-reply-to'.
	(wl-draft-insert-current-message): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 40f0fb6..36b770d 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-30  Tatsuya Kinoshita  <tats@iris.ne.jp>
+
+       * elmo-pop3.el (elmo-pop3-parse-list-response): Allow multiple
+       space delimiter for list response.
+
 2001-12-02  Kenichi OKADA  <okada@opaopa.org>
 
        * elmo-sendlog.el (elmo-sendlog-buffer-name): Deleted.

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 6dfb0d7..e0b3993 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -474,7 +474,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
     (with-temp-buffer
       (insert string)
       (goto-char (point-min))
-      (while (re-search-forward "^\\([0-9]+\\)[\t ]\\([0-9]+\\)$" nil t)
+      (while (re-search-forward "^\\([0-9]+\\)[\t ]+\\([0-9]+\\)$" nil t)
        (setq alist
              (cons
               (cons (elmo-match-buffer 1)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 4ca4a4a..41b7e57 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-30  Tatsuya Kinoshita  <tats@iris.ne.jp>
+
+       * wl-vars.el (wl-draft-add-references): Set default value as nil.
+       (wl-draft-add-in-reply-to): New variable.
+       * wl-draft.el (wl-draft-add-references, wl-draft-add-in-reply-to):
+       Divided from `wl-draft-add-references'; add support `In-Reply-To'.
+       (wl-draft-yank-from-mail-reply-buffer): Use
+       `wl-draft-add-in-reply-to'.
+       (wl-draft-insert-current-message): Ditto.
+
 2001-12-01  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * wl-vars.el (wl-folder-process-duplicates-alist): Fixed

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 703035e..72b62b9 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -414,10 +414,14 @@ Reply to author if WITH-ARG is non-nil."
   (run-hooks 'wl-reply-hook))
 
 (defun wl-draft-add-references ()
+  (wl-draft-add-in-reply-to "References"))
+
+(defun wl-draft-add-in-reply-to (&optional alt-field)
   (let* ((mes-id (save-excursion
                   (set-buffer mail-reply-buffer)
                   (std11-field-body "message-id")))
-        (ref (std11-field-body "References"))
+        (field (or alt-field "In-Reply-To"))
+        (ref (std11-field-body field))
         (ref-list nil) (st nil))
     (when (and mes-id ref)
       (while (string-match "<[^>]+>" ref st)
@@ -429,7 +433,7 @@ Reply to author if WITH-ARG is non-nil."
        (setq mes-id nil)))
     (when mes-id
       (save-excursion
-       (when (mail-position-on-field "References")
+       (when (mail-position-on-field field)
          (forward-line)
          (while (looking-at "^[ \t]")
            (forward-line))
@@ -460,8 +464,10 @@ Reply to author if WITH-ARG is non-nil."
          (mail-yank-hooks (run-hooks 'mail-yank-hooks))
          (wl-draft-cite-function (funcall wl-draft-cite-function))) ; default cite
     (run-hooks 'wl-draft-cited-hook)
-    (when (and wl-draft-add-references
-              (wl-draft-add-references))
+    (when (if wl-draft-add-references
+             (wl-draft-add-references)
+           (if wl-draft-add-in-reply-to
+               (wl-draft-add-in-reply-to)))
       (wl-highlight-headers 'for-draft)) ; highlight when added References:
     (when wl-highlight-body-too
       (wl-highlight-body-region beg (point-max)))))
@@ -567,7 +573,8 @@ Reply to author if WITH-ARG is non-nil."
   (let (original-buffer
        mail-reply-buffer
        mail-citation-hook mail-yank-hooks
-       wl-draft-add-references wl-draft-cite-function)
+       wl-draft-add-references wl-draft-add-in-reply-to
+       wl-draft-cite-function)
     (with-current-buffer wl-draft-buffer-cur-summary-buffer
       (with-current-buffer wl-message-buffer
        (setq original-buffer (wl-message-get-original-buffer))

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index c75e873..8de988b 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -270,7 +270,13 @@ If nil, `wl-from' is used."
   :group 'wl
   :group 'wl-setting)
 
-(defcustom wl-draft-add-references t
+(defcustom wl-draft-add-in-reply-to t
+  "*If non-nil, message-id of the cited message is inserted to the
+in-reply-to field of the current draft."
+  :type 'boolean
+  :group 'wl)
+
+(defcustom wl-draft-add-references nil
   "*If non-nil, message-id of the cited message is inserted to the
 references field of the current draft."
   :type 'boolean