From 0bc2900bbcb6acfdd1d9eba205dd0ebc67d62b65 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 19 Dec 2021 18:50:48 +0200
Subject: [PATCH] Move Rmail autoloads to the common loaddefs.el

* lisp/mail/rmailsum.el:
* lisp/mail/rmailsort.el:
* lisp/mail/rmailmsc.el:
* lisp/mail/rmailmm.el:
* lisp/mail/rmailkwd.el:
* lisp/mail/rmailedit.el:
* lisp/mail/rmail.el: Remove generated-autoload-file setting and
don't require rmail-loaddefs.el
---
 lisp/mail/rmail.el     | 2 --
 lisp/mail/rmailedit.el | 4 ----
 lisp/mail/rmailkwd.el  | 4 ----
 lisp/mail/rmailmm.el   | 4 ----
 lisp/mail/rmailmsc.el  | 4 ----
 lisp/mail/rmailsort.el | 4 ----
 lisp/mail/rmailsum.el  | 4 ----
 7 files changed, 26 deletions(-)

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index afcb7f39bf2..47fd28c18ef 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -41,8 +41,6 @@
 (require 'rfc2047)
 (require 'auth-source)
 
-(require 'rmail-loaddefs)
-
 (declare-function compilation--message->loc "compile" (cl-x) t)
 (declare-function epa--find-coding-system-for-mime-charset "epa" (mime-charset))
 
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index fd24bdceccc..18859f2b28d 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -484,8 +484,4 @@ HEADER-DIFF should be a return value from `rmail-edit-diff-headers'."
 
 (provide 'rmailedit)
 
-;; Local Variables:
-;; generated-autoload-file: "rmail-loaddefs.el"
-;; End:
-
 ;;; rmailedit.el ends here
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index d8fcc1c0a99..7efbfde27d1 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -188,8 +188,4 @@ With prefix argument N moves forward N messages with these labels."
 
 (provide 'rmailkwd)
 
-;; Local Variables:
-;; generated-autoload-file: "rmail-loaddefs.el"
-;; End:
-
 ;;; rmailkwd.el ends here
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 66a1e9a4dbd..563ce9d0b82 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1569,8 +1569,4 @@ This is the usual value of `rmail-insert-mime-forwarded-message-function'."
 
 (provide 'rmailmm)
 
-;; Local Variables:
-;; generated-autoload-file: "rmail-loaddefs.el"
-;; End:
-
 ;;; rmailmm.el ends here
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 673b2c5a7e5..f5e89f8f17c 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -54,8 +54,4 @@ 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-loaddefs.el"
-;; End:
-
 ;;; rmailmsc.el ends here
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 1669c8cd7bb..8c790116a3b 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -250,8 +250,4 @@ Numeric keys are sorted numerically, all others as strings."
 
 (provide 'rmailsort)
 
-;; Local Variables:
-;; generated-autoload-file: "rmail-loaddefs.el"
-;; End:
-
 ;;; rmailsort.el ends here
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 8fc3fc095cc..ef172bc106f 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1877,8 +1877,4 @@ the summary is only showing a subset of messages."
 
 (provide 'rmailsum)
 
-;; Local Variables:
-;; generated-autoload-file: "rmail-loaddefs.el"
-;; End:
-
 ;;; rmailsum.el ends here
-- 
2.39.2