* gnus-draft.el (gnus-draft-edit-message): Make sure to remove Date header.

* message.el (message-draft-headers): Add Date.
(message-headers-to-generate): Fix typo in docstring.

* nndraft.el (nndraft-required-headers): New variable.
(nndraft-generate-headers): Use it.

* gnus-registry.el (gnus-registry-wash-for-keywords): Bind `word'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a8ce42..64af14e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2006-10-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-draft.el (gnus-draft-edit-message): Make sure to remove Date
+       header.
+
+       * message.el (message-draft-headers): Add Date.
+       (message-headers-to-generate): Fix typo in docstring.
+
+       * nndraft.el (nndraft-required-headers): New variable.
+       (nndraft-generate-headers): Use it.
+
+       * gnus-registry.el (gnus-registry-wash-for-keywords): Bind `word'.
+
 2006-10-16  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-registry.el (gnus-registry-wash-for-keywords)

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 9d992e4..6873214 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -105,7 +105,9 @@
       (save-restriction
        (message-narrow-to-headers)
        (message-remove-header "date")))
-    (save-buffer)
+    (let ((message-draft-headers
+          (delq 'Date (copy-sequence message-draft-headers))))
+      (save-buffer))
     (let ((gnus-verbose-backends nil))
       (gnus-request-expire-articles (list article) group t))
     (push

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index babba32..ca77939 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -495,24 +495,23 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 (defun gnus-registry-wash-for-keywords (&optional force)
   (interactive)
   (let ((id (gnus-registry-fetch-message-id-fast gnus-current-article))
-       words)
-    (if (or (not (gnus-registry-fetch-extra id 'keywords)) 
+       word words)
+    (if (or (not (gnus-registry-fetch-extra id 'keywords))
            force)
-      (save-excursion
-       (set-buffer gnus-article-buffer)
-       (let (words)
+       (save-excursion
+         (set-buffer gnus-article-buffer)
          (article-goto-body)
          (save-window-excursion
            (save-restriction
              (narrow-to-region (point) (point-max))
              (with-syntax-table gnus-adaptive-word-syntax-table
                (while (re-search-forward "\\b\\w+\\b" nil t)
-                 (setq word (gnus-registry-remove-alist-text-properties 
+                 (setq word (gnus-registry-remove-alist-text-properties
                              (downcase (buffer-substring
                                         (match-beginning 0) (match-end 0)))))
                  (if (> (length word) 3)
                      (push word words))))))
-         (gnus-registry-store-extra-entry id 'keywords words))))))
+         (gnus-registry-store-extra-entry id 'keywords words)))))
 
 (defun gnus-registry-find-keywords (keyword)
   (interactive "skeyword: ")

diff --git a/lisp/message.el b/lisp/message.el
index 11d8ff6..51547ad 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -208,7 +208,7 @@ Also see `message-required-news-headers' and
   :link '(custom-manual "(message)Message Headers")
   :type '(repeat sexp))
 
-(defcustom message-draft-headers '(References From)
+(defcustom message-draft-headers '(References From Date)
   "*Headers to be generated when saving a draft message."
   :version "22.1"
   :group 'message-news
@@ -5825,7 +5825,7 @@ between beginning of field and beginning of line."
 
 (defun message-headers-to-generate (headers included-headers excluded-headers)
   "Return a list that includes all headers from HEADERS.
-If INCLUDED-HEADERS is a list, just include those headers.  If if is
+If INCLUDED-HEADERS is a list, just include those headers.  If it is
 t, include all headers.  In any case, headers from EXCLUDED-HEADERS
 are not included."
   (let ((result nil)

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index f7ab938..308ff7d 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -42,6 +42,11 @@
   "Where nndraft will store its files."
   nnmh-directory)
 
+(defvar nndraft-required-headers '(Date)
+  "*Headers to be generated when saving a draft message.
+The headers in this variable and the ones in `message-required-headers'
+are generated if and only if they are also in `message-draft-headers'.")
+
 \f
 
 (defvoo nndraft-current-group "" nil nnmh-current-group)
@@ -156,7 +161,7 @@
   (save-excursion
     (message-generate-headers
      (message-headers-to-generate
-      message-required-headers message-draft-headers nil))))
+      nndraft-required-headers message-draft-headers nil))))
 
 (deffoo nndraft-request-associate-buffer (group)
   "Associate the current buffer with some article in the draft group."