summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-05-08 23:46:51 -0700
committerGlenn Morris <rgm@gnu.org>2013-05-08 23:46:51 -0700
commit59c886717271b57d661027685d203a3dd5cfafa7 (patch)
treee4345c16b4347b6758e95c7375aad16804bca961
parentd631786abe3f736aac572bbb56436fd2b56a671c (diff)
downloademacs-59c886717271b57d661027685d203a3dd5cfafa7.tar.gz
* lisp/gnus/mml1991.el: Make it loadable.
* lisp/gnus/mml2015.el: Comment. Fixes: debbugs:13456
-rw-r--r--lisp/gnus/ChangeLog2
-rw-r--r--lisp/gnus/mml1991.el2
-rw-r--r--lisp/gnus/mml2015.el3
3 files changed, 7 insertions, 0 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ede6435789c..ea2bfa784d7 100644
--- 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 5af7639019a..52b8e347edf 100644
--- 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 4d2647f3b8a..c3905b88e7b 100644
--- 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