* mm-encode.el (mm-sign-option, mm-encrypt-option): New user option;

moved from mm-decode.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f3be79..08d8607 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,8 @@
 2009-09-22  Daiki Ueno  <ueno@unixuser.org>
 
 2009-09-22  Daiki Ueno  <ueno@unixuser.org>
 

-       * mm-decode.el (mm-sign-option): New user option.
+       * mm-encode.el (mm-sign-option, mm-encrypt-option): New user option.

        * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Let users select
        * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Let users select

-       signing keys if mm-sign-option is 'guided.
+       keys from the menu if mm-{sign,encrypt}-option is 'guided.

        * mml-smime.el (mml-smime-epg-sign, mml-smime-epg-encrypt): Ditto.
        * mml1991.el (mml1991-epg-sign, mml1991-epg-encrypt): Ditto.
 
        * mml-smime.el (mml-smime-epg-sign, mml-smime-epg-encrypt): Ditto.
        * mml1991.el (mml1991-epg-sign, mml1991-epg-encrypt): Ditto.
 

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index afbc0b8..098f091 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -488,15 +488,6 @@ result of the verification."
                 (item :tag "ask" nil))
   :group 'mime-security)
 
                 (item :tag "ask" nil))
   :group 'mime-security)
 

-(defcustom mm-sign-option nil
-  "Option how to create signed parts.
-nil, use the default keys without asking;
-`guided', let you select signing keys from the menu."
-  :version "23.1"
-  :type '(choice (item guided)
-                (item :tag "default" nil))
-  :group 'mime-security)
-

 (defvar mm-viewer-completion-map
   (let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
     (set-keymap-parent map minibuffer-local-completion-map)
 (defvar mm-viewer-completion-map
   (let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
     (set-keymap-parent map minibuffer-local-completion-map)

diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el
index 0d41caa..d4f9ea7 100644 (file)
--- a/lisp/mm-encode.el
+++ b/lisp/mm-encode.el
@@ -60,6 +60,24 @@ to specify encoding of non-ASCII MIME parts."
                               (const base64))))
   :group 'mime)
 
                               (const base64))))
   :group 'mime)
 

+(defcustom mm-sign-option nil
+  "Option how to create signed parts.
+nil, use the default keys without asking;
+`guided', let you select signing keys from the menu."
+  :version "23.1"
+  :type '(choice (item guided)
+                (item :tag "default" nil))
+  :group 'mime-security)
+
+(defcustom mm-encrypt-option nil
+  "Option how to create encrypted parts.
+nil, use the default keys without asking;
+`guided', let you select recipients' keys from the menu."
+  :version "23.1"
+  :type '(choice (item guided)
+                (item :tag "default" nil))
+  :group 'mime-security)
+

 (defvar mm-use-ultra-safe-encoding nil
   "If non-nil, use encodings aimed at Procrustean bed survival.
 
 (defvar mm-use-ultra-safe-encoding nil
   "If non-nil, use encodings aimed at Procrustean bed survival.
 

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index bf4ac6f..8aeb564 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -462,7 +462,7 @@ Content-Disposition: attachment; filename=smime.p7s
                         (message-options-set 'message-recipients
                                              (read-string "Recipients: ")))
                     "[ \f\t\n\r\v,]+"))))
                         (message-options-set 'message-recipients
                                              (read-string "Recipients: ")))
                     "[ \f\t\n\r\v,]+"))))

-      (if (eq mm-sign-option 'guided)
+      (if (eq mm-encrypt-option 'guided)

          (setq recipients
                (epa-select-keys context "\
 Select recipients for encryption.
          (setq recipients
                (epa-select-keys context "\
 Select recipients for encryption.

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index c027c5f..7d4f828 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -34,7 +34,7 @@
   (require 'cl)
   (require 'mm-util))
 
   (require 'cl)
   (require 'mm-util))
 

-(require 'mm-decode)
+(require 'mm-encode)

 (require 'mml-sec)
 
 (defvar mc-pgp-always-sign)
 (require 'mml-sec)
 
 (defvar mc-pgp-always-sign)


@@ -449,7 +449,7 @@ If no one is selected, default secret key is used.  "
                               (or (epg-expand-group config recipient)
                                   (list recipient)))
                             recipients))))
                               (or (epg-expand-group config recipient)
                                   (list recipient)))
                             recipients))))

-    (if (eq mm-sign-option 'guided)
+    (if (eq mm-encrypt-option 'guided)

        (setq recipients
              (epa-select-keys context "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
        (setq recipients
              (epa-select-keys context "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 22a0184..d6d06c3 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -1269,7 +1269,7 @@ If no one is selected, default secret key is used.  "
        (unless mml2015-signers
          (error "mml2015-signers not set"))
        (setq recipients (nconc recipients mml2015-signers)))
        (unless mml2015-signers
          (error "mml2015-signers not set"))
        (setq recipients (nconc recipients mml2015-signers)))

-      (if (eq mm-sign-option 'guided)
+      (if (eq mm-encrypt-option 'guided)

          (setq recipients
                (epa-select-keys context "\
 Select recipients for encryption.
          (setq recipients
                (epa-select-keys context "\
 Select recipients for encryption.