; Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / mml-sec.el

diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index 576eceecf4bc2945b6586007720a9cfadd827399..0e2d4381993664cd6d9277e187a05bec615d7c58 100644 (file)
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -38,6 +38,7 @@
 (autoload 'mml1991-encrypt "mml1991")
 (autoload 'message-fetch-field "message")
 (autoload 'message-goto-body "message")
+(autoload 'message-options-get "message")
 (autoload 'mml-insert-tag "mml")
 (autoload 'mml-smime-sign "mml-smime")
 (autoload 'mml-smime-encrypt "mml-smime")
@@ -49,6 +50,8 @@
 (autoload 'message-options-get "message")
 (autoload 'message-options-set "message")
 
+(declare-function message-options-set "message" (symbol value))
+
 (defvar mml-sign-alist
   '(("smime"     mml-smime-sign-buffer     mml-smime-sign-query)
     ("pgp"       mml-pgp-sign-buffer       list)
@@ -115,6 +118,7 @@ details."
   :group 'message
   :type 'boolean)
 
+;; FIXME If it's "NOT recommended", why is it the default?
 (defcustom mml-secure-cache-passphrase password-cache
   "If t, cache OpenPGP or S/MIME passphrases inside Emacs.
 Passphrase caching in Emacs is NOT recommended.  Use gpg-agent instead.