From: yoichi Date: Tue, 31 Dec 2002 08:09:13 +0000 (+0000) Subject: 2002-12-31 Ron Isaacson X-Git-Tag: merged-trunk-to-elmo-mark-14~60 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=00793a88d01d0d7cf7fb15d878df5c9fcc4c0234;p=elisp%2Fwanderlust.git 2002-12-31 Ron Isaacson * wl-summary.el (wl-summary-mark-collect): Revive missing return for sequential numbering case. 2002-12-25 Yoichi NAKAYAMA * wl-vars.el (wl-draft-reply-with-argument-list): Change default value. (wl-draft-reply-without-argument-list): Ditto. (wl-draft-reply-myself-with-argument-list): Abolish. (wl-draft-reply-myself-without-argument-list): Ditto. * wl-draft.el (wl-draft-self-reply-p): New function. (wl-draft-reply-list-symbol): Merge into `wl-draft-reply'. --- diff --git a/wl/ChangeLog b/wl/ChangeLog index b1d297d..54131a1 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,18 @@ +2002-12-31 Ron Isaacson + + * wl-summary.el (wl-summary-mark-collect): Revive missing return + for sequential numbering case. + +2002-12-25 Yoichi NAKAYAMA + + * wl-vars.el (wl-draft-reply-with-argument-list): Change default + value. + (wl-draft-reply-without-argument-list): Ditto. + (wl-draft-reply-myself-with-argument-list): Abolish. + (wl-draft-reply-myself-without-argument-list): Ditto. + * wl-draft.el (wl-draft-self-reply-p): New function. + (wl-draft-reply-list-symbol): Merge into `wl-draft-reply'. + 2002-12-24 Yoichi NAKAYAMA * wl-e21.el (toplevel): Do not set wl-folder-mode-map. diff --git a/wl/wl-draft.el b/wl/wl-draft.el index b67a77e..901bb21 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -313,16 +313,8 @@ e.g. (substring subject (match-end 0)) subject)) -(defun wl-draft-reply-list-symbol (with-arg) - "Return symbol `wl-draft-reply-*-argument-list' match condition. -Check WITH-ARG and From: field." - (if (wl-address-user-mail-address-p (or (elmo-field-body "From") "")) - (if with-arg - 'wl-draft-reply-myself-with-argument-list - 'wl-draft-reply-myself-without-argument-list) - (if with-arg - 'wl-draft-reply-with-argument-list - 'wl-draft-reply-without-argument-list))) +(defun wl-draft-self-reply-p () + (wl-address-user-mail-address-p (or (elmo-field-body "From") ""))) (defun wl-draft-reply (buf with-arg summary-buf) "Reply to BUF buffer message. @@ -335,7 +327,8 @@ Reply to author if WITH-ARG is non-nil." (with-current-buffer summary-buf (setq parent-folder (wl-summary-buffer-folder-name)))) (set-buffer (or buf mime-mother-buffer)) - (setq r-list (symbol-value (wl-draft-reply-list-symbol with-arg))) + (setq r-list (if with-arg wl-draft-reply-with-argument-list + wl-draft-reply-without-argument-list)) (catch 'done (while r-list (when (let ((condition (car (car r-list)))) @@ -379,7 +372,8 @@ Reply to author if WITH-ARG is non-nil." (throw 'done nil)) (setq r-list (cdr r-list))) (error "No match field: check your `%s'" - (symbol-name (wl-draft-reply-list-symbol with-arg)))) + (if with-arg "wl-draft-reply-with-argument-list" + "wl-draft-reply-without-argument-list"))) (setq subject (std11-field-body "Subject")) (setq to (wl-parse-addresses to) cc (wl-parse-addresses cc)) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index c2a4d7f..d521f8b 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -3000,7 +3000,8 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (while (not (eobp)) (when (string= (wl-summary-temp-mark) mark) (setq msglist (cons (wl-summary-message-number) msglist))) - (forward-line 1))))))) + (forward-line 1)) + (elmo-uniq-list msglist)))))) (defun wl-summary-exec () (interactive) diff --git a/wl/wl-vars.el b/wl/wl-vars.el index 72c4f5d..ef8f0f7 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -744,18 +744,11 @@ Prepared candidates are 'wl-draft-send-mail-with-smtp, :group 'wl-draft) (defcustom wl-draft-reply-with-argument-list - '((("Followup-To" "Mail-Followup-To") - . (("Mail-Followup-To") ("From" "To" "Cc") ("Followup-To"))) - ("Followup-To" - . (("From") ("To" "Cc") ("Followup-To"))) - ("Mail-Followup-To" - . (("Mail-Followup-To") ("From" "To" "Cc") ("Newsgroups"))) - ("Mail-Reply-To" . (("Mail-Reply-To") ("From" "To" "Cc") ("Newsgroups"))) - ("Reply-To" . (("Reply-To") ("From" "To" "Cc") ("Newsgroups"))) - ("Newsgroups" . (("From") ("To" "Cc") ("Newsgroups"))) - ("From" . (("From") nil nil))) + '(("From" . (("Reply-To" "Mail-Reply-To" "From") + ("Mail-Followup-To" "To" "Cc") + ("Followup-To" "Newsgroups")))) "Alist of cons cell of -('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')\) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -769,16 +762,16 @@ Default is for 'reply-to-author'." :group 'wl-draft) (defcustom wl-draft-reply-without-argument-list - '((("Followup-To" "Mail-Followup-To") - . (("Mail-Followup-To") nil ("Followup-To"))) - ("Followup-To" . (nil nil ("Followup-To"))) - ("Mail-Followup-To" . (("Mail-Followup-To") nil ("Newsgroups"))) - ("Mail-Reply-To" . (("Mail-Reply-To") nil nil)) - ("Reply-To" . (("Reply-To") nil nil)) - ("Newsgroups" . (nil nil ("Newsgroups"))) + '(("Followup-To" . (("Mail-Followup-To" "Mail-Reply-To" "Reply-To") + nil ("Followup-To"))) + ("Mail-Followup-To" . (("Mail-Followup-To") nil nil)) + ("Newsgroups" . (("Mail-Reply-To" "Reply-To" "To") ("Cc") ("Newsgroups"))) + ("Mail-Reply-To" . (("Mail-Reply-To" "Reply-To") ("To" "Cc") nil)) + ("Reply-To" . (("Reply-To") ("To" "Cc") nil)) + (wl-draft-self-reply-p . (("To") ("Cc") nil)) ("From" . (("From") ("To" "Cc") nil))) "Alist of cons cell of -('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')\) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -791,42 +784,6 @@ Default is for 'reply-to-all'." (repeat :tag "Fields For Newsgroups" string)))) :group 'wl-draft) -(defcustom wl-draft-reply-myself-with-argument-list - '(("Followup-To" . (("To") ("Cc") ("Followup-To"))) - ("Newsgroups" . (("To") ("Cc") ("Newsgroups"))) - ("From" . (("To") ("Cc") nil))) - "Alist of cons cell of -('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) -'field-name' is a string. -'fields for ***' is a list of strings. -If car of each cons cell exists in original message, -cdr of each cons cell is used for draft message. -Default is for 'reply-to-me'." - :type '(repeat (cons (choice (string :tag "Field Name") - (repeat (string :tag "Field Name"))) - (list (repeat :tag "Fields For To" string) - (repeat :tag "Fields For Cc" string) - (repeat :tag "Fields For Newsgroups" string)))) - :group 'wl-draft) - -(defcustom wl-draft-reply-myself-without-argument-list - '(("Followup-To" . (("To") ("Cc") ("Followup-To"))) - ("Newsgroups" . (("To") ("Cc") ("Newsgroups"))) - ("From" . (("To") ("Cc") nil))) - "Alist of cons cell of -('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) -'field-name' is a string. -'fields for ***' is a list of strings. -If car of each cons cell exists in original message, -cdr of each cons cell is used for draft message. -Default is for 'followup-to-me'." - :type '(repeat (cons (choice (string :tag "Field Name") - (repeat (string :tag "Field Name"))) - (list (repeat :tag "Fields For To" string) - (repeat :tag "Fields For Cc" string) - (repeat :tag "Fields For Newsgroups" string)))) - :group 'wl-draft) - (defcustom wl-draft-always-delete-myself nil "*Always delete myself from reciepient if non-nil." :type 'boolean @@ -2696,6 +2653,12 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format." ;;;; Obsolete variables. +;; 2002-12-25 +(elmo-define-obsolete-variable 'wl-draft-reply-myself-with-argument-list + 'wl-draft-reply-with-argument-list) +(elmo-define-obsolete-variable 'wl-draft-reply-myself-without-argument-list + 'wl-draft-reply-without-argument-list) + ;; 2001-12-11: *-dir -> *-directory (elmo-define-obsolete-variable 'wl-icon-dir 'wl-icon-directory)