From 35426db400afeef2036b93cc7497e4cb4028d4b1 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Thu, 10 Sep 2009 06:18:23 +0000
Subject: [PATCH] Put autoloads in rmail.el rather than loaddefs.el.

---
 lisp/mail/rmailedit.el | 4 ++++
 lisp/mail/rmailkwd.el  | 5 +++++
 lisp/mail/rmailmm.el   | 4 ++++
 lisp/mail/rmailmsc.el  | 5 +++++
 lisp/mail/rmailsort.el | 4 ++++
 lisp/mail/undigest.el  | 6 ++++++
 6 files changed, 28 insertions(+)

diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index d350c29006b..e119ed2f133 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -387,5 +387,9 @@ HEADER-DIFF should be a return value from `rmail-edit-diff-headers'."
 
 (provide 'rmailedit)
 
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
+
 ;; arch-tag: 9524f335-12cc-4e95-9e9b-3208dc30550b
 ;;; rmailedit.el ends here
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index b52ad4897f8..76135c6178d 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -159,6 +159,7 @@ With prefix argument N moves backward N messages with these labels."
 LABELS should be a comma-separated list of label names.
 If LABELS is empty, the last set of labels specified is used.
 With prefix argument N moves forward N messages with these labels."
+  ;; FIXME show the default in the prompt.
   (interactive "p\nsMove to next msg with labels: ")
   (if (string= labels "")
       (setq labels rmail-last-multi-labels))
@@ -188,5 +189,9 @@ With prefix argument N moves forward N messages with these labels."
 
 (provide 'rmailkwd)
 
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
+
 ;; arch-tag: 1149979c-8e47-4333-9629-cf3dc887a6a7
 ;;; rmailkwd.el ends here
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 93e9c3424bd..0ba6fe2c88b 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -406,5 +406,9 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
 
 (provide 'rmailmm)
 
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
+
 ;; arch-tag: 3f2c5e5d-1aef-4512-bc20-fd737c9d5dd9
 ;;; rmailmm.el ends here
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 0345e720f5f..861a0ea7292 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -41,6 +41,7 @@ This applies only to the current session."
 	 (with-temp-buffer
 	   (insert file-name)
 	   (goto-char (point-min))
+	   ;; split-string does not remove leading/trailing whitespace.
 	   (nreverse (mail-parse-comma-list)))))
     (when (or (not rmail-inbox-list)
 	      (y-or-n-p (concat "Replace "
@@ -53,5 +54,9 @@ This applies only to the current session."
       (setq rmail-inbox-list inbox-list)))
   (rmail-show-message-1 rmail-current-message))
 
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
+
 ;; arch-tag: 94614a62-2a0a-4e25-bac9-06f461ed4c60
 ;;; rmailmsc.el ends here
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 39244669928..00d0bad4af2 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -250,5 +250,9 @@ Numeric keys are sorted numerically, all others as strings."
 
 (provide 'rmailsort)
 
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
+
 ;; arch-tag: 665da245-f6a7-4115-ad8c-ba19216988d5
 ;;; rmailsort.el ends here
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 2a0ea5ad549..54293b0d4f9 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -213,6 +213,7 @@ Leaves original message, deleted, before the undigestified messages."
 	    (set-buffer buff)
 	    (rmail-swap-buffers-maybe)
 	    (goto-char (point-max))
+	    ;; FIXME use rmail-count-new-messages.
 	    (rmail-set-message-counters)
 	    (set-buffer-modified-p t)
 	    (rmail-show-message current)
@@ -312,6 +313,7 @@ following the containing message."
 	  (set-buffer buff)
 	  (rmail-swap-buffers-maybe)
 	  (goto-char (point-max))
+	  ;; FIXME use rmail-count-new-messages.
 	  (rmail-set-message-counters)
 	  (set-buffer-modified-p t)
 	  (rmail-show-message current)
@@ -323,5 +325,9 @@ following the containing message."
 
 (provide 'undigest)
 
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
+
 ;; arch-tag: 3a28b9fb-c1f5-43ef-9278-285f3e4b874d
 ;;; undigest.el ends here
-- 
2.39.2