[Emacs-diffs] /srv/bzr/emacs/trunk r112532: * lisp/gnus/mml1991.el: Make it loadable.

[Glenn Morris]

------------------------------------------------------------
revno: 112532
fixes bug: http://debbugs.gnu.org/13456
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-08 23:46:51 -0700
message:
  * lisp/gnus/mml1991.el: Make it loadable. 
  
  * lisp/gnus/mml2015.el: Comment.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mml1991.el
  lisp/gnus/mml2015.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-05-09 01:40:20 +0000
+++ b/lisp/gnus/ChangeLog       2013-05-09 06:46:51 +0000
@@ -1,5 +1,7 @@
 2013-05-09  Glenn Morris  <address@hidden>
 
+       * 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):

=== modified file 'lisp/gnus/mml1991.el'
--- a/lisp/gnus/mml1991.el      2013-03-05 17:13:01 +0000
+++ b/lisp/gnus/mml1991.el      2013-05-09 06:46:51 +0000
@@ -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.")
 

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2013-05-06 07:16:34 +0000
+++ b/lisp/gnus/mml2015.el      2013-05-09 06:46:51 +0000
@@ -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