* wl-news.el.in (wl-news-buffer-oldest-version): New local variable.

(wl-news): Set it.
(wl-news-append-to-folder): Use it.

* wl-news.el.in (wl-news-send-news): Append to specified folder
instead of wl-default-folder.
(wl-news-append-to-folder): Show error message with specified folder.

* wl-vars.el: Follow "Left Margin Convention" in Emacs Manual.
	In most major modes, Emacs assumes that any opening
	delimiter found at the left margin is the start of a
	top-level definition, or defun. Therefore, *never put an
	opening delimiter at the left margin unless it should have
	that significance.*

* wl-draft.el (wl-draft-reply): List in r-list can contain function.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 1edc3d2..0a0516f 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,22 @@
+2003-01-06  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-news.el.in (wl-news-buffer-oldest-version): New local variable.
+       (wl-news): Set it.
+       (wl-news-append-to-folder): Use it.
+
+       * wl-news.el.in (wl-news-send-news): Append to specified folder
+       instead of wl-default-folder.
+       (wl-news-append-to-folder): Show error message with specified folder.
+
+       * wl-vars.el: Follow "Left Margin Convention" in Emacs Manual.
+               In most major modes, Emacs assumes that any opening
+               delimiter found at the left margin is the start of a
+               top-level definition, or defun. Therefore, *never put an
+               opening delimiter at the left margin unless it should have
+               that significance.*
+
+       * wl-draft.el (wl-draft-reply): List in r-list can contain function.
+
 2003-01-05  NAKAJIMA Mikio  <minakaji@osaka.email.ne.jp>
 
        * wl-draft.el (wl-draft-self-reply-p): Add doc string.

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index c702ec7..56955a9 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -338,8 +338,15 @@ Reply to author if WITH-ARG is non-nil."
                      ((listp condition)
                       (catch 'done
                         (while condition
-                          (if (not (std11-field-body (car condition)))
-                              (throw 'done nil))
+                          (cond
+                           ((stringp (car condition))
+                            (or (std11-field-body (car condition))
+                                (throw 'done nil)))
+                           ((symbolp (car condition))
+                            (or (funcall (car condition))
+                                (throw 'done nil)))
+                           (t
+                            (debug)))
                           (setq condition (cdr condition)))
                         t))
                      ((symbolp condition)

diff --git a/wl/wl-news.el.in b/wl/wl-news.el.in
index 86bc4eb..f485014 100644 (file)
--- a/wl/wl-news.el.in
+++ b/wl/wl-news.el.in
@@ -169,9 +169,9 @@
       (wl-draft-get-header-delimiter t)
       (setq ret
            (and (elmo-folder-writable-p
-                 (wl-folder-get-elmo-folder wl-default-folder))
+                 (wl-folder-get-elmo-folder folder))
                 (elmo-folder-append-buffer
-                 (wl-folder-get-elmo-folder wl-default-folder) t)))
+                 (wl-folder-get-elmo-folder folder) t)))
       (wl-draft-hide send-buffer)
       (wl-draft-delete send-buffer))
     ret))
@@ -181,6 +181,8 @@
 (defvar wl-news-buf-name "NEWS")
 (defvar wl-news-mode-map nil)
 (defvar wl-news-winconf nil)
+(defvar wl-news-buffer-oldest-version nil)
+(make-variable-buffer-local 'wl-news-buffer-oldest-version)
 
 (unless wl-news-mode-map
   (setq wl-news-mode-map (make-sparse-keymap))
@@ -214,6 +216,7 @@
                  (setq wl-news-winconf (current-window-configuration))
                  (set-buffer (get-buffer-create wl-news-buf-name))
                  (wl-news-mode)
+                 (setq wl-news-buffer-oldest-version previous-version)
                  (buffer-disable-undo (current-buffer))
                  ;; insert news
                  (let ((buffer-read-only nil))
@@ -270,8 +273,7 @@
 
 (defun wl-news-append-to-folder ()
   (interactive)
-  (let* ((oldest-version (cdr (wl-news-previous-version-load)))
-        (current-version (product-version (product-find 'wl-version)))
+  (let* ((current-version (product-version (product-find 'wl-version)))
         (new-old-version current-version)
         (folder wl-default-folder))
     (if (or (and (elmo-folder-writable-p
@@ -281,9 +283,9 @@
                            wl-default-folder)))
            (setq folder
                  (wl-summary-read-folder wl-default-folder "to append ")))
-       (or (wl-news-send-news oldest-version wl-news-lang)
+       (or (wl-news-send-news wl-news-buffer-oldest-version wl-news-lang)
            (error
-            (format "Cannot append NEWS mail to %s" wl-default-folder))))))
+            (format "Cannot append NEWS mail to %s" folder))))))
 
 (defun wl-news-force-exit ()
   (interactive)
@@ -300,4 +302,4 @@
 (require 'product)
 (product-provide (provide 'wl-news) (require 'wl-version))
 
-;;; wl-news.el ends here
\ No newline at end of file
+;;; wl-news.el ends here

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index ef8f0f7..1c6187d 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -200,7 +200,7 @@ If no match, `wl-summary-default-view' is used."
     (?a (length wl-summary-buffer-number-list)))
   "An alist of format specifications that can appear in summary mode-lines.
 Each element is a list of following:
-\(SPEC STRING-EXP\)
+\(SPEC STRING-EXP)
 SPEC is a character for format specification.
 STRING-EXP is an expression to get string to insert.")
 
@@ -247,7 +247,7 @@ which are replaced by the given information:
     (?@ (wl-summary-line-attached)))
   "An alist of format specifications that can appear in summary lines.
 Each element is a list of following:
-\(SPEC STRING-EXP\)
+\(SPEC STRING-EXP)
 SPEC is a character for format specification.
 STRING-EXP is an expression to get string to insert.")
 
@@ -480,7 +480,7 @@ If nil, don't authenticate."
   "*POP3 user name to send mail using POP-before-SMTP.
 If nil, `elmo-pop3-default-user' is used.
 To use POP-before-SMTP,
-\(setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp\)"
+\(setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp)"
   :type '(choice (const :tag "none" nil)
                 string)
   :group 'wl
@@ -748,12 +748,12 @@ Prepared candidates are 'wl-draft-send-mail-with-smtp,
               ("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,
 cdr of each cons cell is used for draft message.
-Default is for 'reply-to-author'."
+Default is for 'reply-to-all'."
   :type '(repeat (cons (choice (string :tag "Field Name")
                               (repeat (string :tag "Field Name")))
                       (list (repeat :tag "Fields For To" string)
@@ -762,8 +762,7 @@ Default is for 'reply-to-author'."
   :group 'wl-draft)
 
 (defcustom wl-draft-reply-without-argument-list
-  '(("Followup-To" . (("Mail-Followup-To" "Mail-Reply-To" "Reply-To")
-                     nil ("Followup-To")))
+  '(("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))
@@ -771,12 +770,11 @@ Default is for 'reply-to-author'."
     (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,
-cdr of each cons cell is used for draft message.
-Default is for 'reply-to-all'."
+cdr of each cons cell is used for draft message."
   :type '(repeat (cons (choice (string :tag "Field Name")
                               (repeat (string :tag "Field Name")))
                       (list (repeat :tag "Fields For To" string)
@@ -914,7 +912,7 @@ Default is for 'reply-to-all'."
 (defcustom wl-summary-fix-timezone nil
   "*Time zone of the date string in summary mode.
 If nil, it is adjust to the default time zone information
-\(system's default time zone or environment variable TZ\)."
+\(system's default time zone or environment variable TZ)."
   :type '(choice (const :tag "Default time zone" nil)
                 string)
   :group 'wl-summary)
@@ -1422,7 +1420,7 @@ which appear just before @."
     (?n wl-message-buffer-cur-number))
   "An alist of format specifications for message buffer's mode-lines.
 Each element is a list of following:
-\(SPEC STRING-EXP\)
+\(SPEC STRING-EXP)
 SPEC is a character for format specification.
 STRING-EXP is an expression to get string to insert.")
 
@@ -2019,7 +2017,7 @@ e.x.
     ("^-han\\." . (2 "+" "+" "|" "-" " ")))
   "Thread indent set alist.
 If no match, following indent set is used.
-(wl-thread-indent-level
+\(wl-thread-indent-level
  wl-thread-have-younger-brother-str
  wl-thread-youngest-child-str
  wl-thread-vertical-str