* lisp/gnus/mml1991.el: Make it loadable.

* lisp/gnus/mml2015.el: Comment.

Fixes: debbugs:13456

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ede6435789c5248d4ac935ffc42c8397b7c525ab..ea2bfa784d7926340ab39e56e4c96745e9623557 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2013-05-09  Glenn Morris  <rgm@gnu.org>
 
+       * mml1991.el: Make it loadable.  (Bug#13456)
+
        * gnus-art.el (gnus-article-date-headers, gnus-blocked-images):
        * gnus-async.el (gnus-async-post-fetch-function):
        * gnus-gravatar.el (gnus-gravatar-size, gnus-gravatar-properties):

diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 5af7639019a1d94a85db1fc74b22cac8f7e82b26..52b8e347edf3673ca70757cc9f6255eac5241e5f 100644 (file)
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -50,6 +50,8 @@
 (autoload 'message-options-get "message")
 (autoload 'message-options-set "message")
 
+(require 'mml2015)
+
 (defvar mml1991-use mml2015-use
   "The package used for PGP.")
 

diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 4d2647f3b8aed7a06e4ad99cc3d8ea3bab281af1..c3905b88e7b52745e251558db1e984268a8e7578 100644 (file)
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -47,6 +47,9 @@
                   (config &optional minimum-version))
 (declare-function epg-configuration "ext:epg-config" ())
 
+;; Maybe this should be in eg mml-sec.el (and have a different name).
+;; Then mml1991 would not need to require mml2015, and mml1991-use
+;; could be removed.
 (defvar mml2015-use (or
                     (condition-case nil
                         (progn