moved from mm-decode.el.
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
- 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.
(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)
(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.
(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.
(require 'cl)
(require 'mm-util))
-(require 'mm-decode)
+(require 'mm-encode)
(require 'mml-sec)
(defvar mc-pgp-always-sign)
(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. "
(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.