* mml2015.el (mml2015-encrypt-to-self): Turn on by default.

(mml2015-always-trust): New user option.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 778c067..5537cf7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
        * mml2015.el (mml2015-epg-encrypt): Removed backward compatibility for
        EasyPG (< 0.0.6).
+       (mml2015-encrypt-to-self): Turn on by default.
+       (mml2015-always-trust): New user option.
 
 2006-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 0e55012..f68af77 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -131,11 +131,16 @@ Whether the passphrase is cached at all is controlled by
   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 
-(defcustom mml2015-encrypt-to-self nil
+(defcustom mml2015-encrypt-to-self t
   "If t, add your own key ID to recipient list when encryption."
   :group 'mime-security
   :type 'boolean)
 
+(defcustom mml2015-always-trust t
+  "If t, GnuPG skip key validation on encryption."
+  :group 'mime-security
+  :type 'boolean)
+
 ;;; mailcrypt wrapper
 
 (eval-and-compile
@@ -1217,7 +1222,8 @@ If no one is selected, default secret key is used.  "
         #'mml2015-epg-passphrase-callback))
     (condition-case error
        (setq cipher
-             (epg-encrypt-string context (buffer-string) recipients sign)
+             (epg-encrypt-string context (buffer-string) recipients sign
+                                 mml2015-always-trust)
              mml2015-epg-secret-key-id-list nil)
       (error
        (while mml2015-epg-secret-key-id-list