comparison lisp/gnus/mml-smime.el @ 105253:baa4e6ac9e46

Synch with Gnus trunk. 2009-09-22 Daiki Ueno <ueno@unixuser.org> * mm-encode.el (mm-sign-option, mm-encrypt-option): New user option. * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Let users select 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. 2009-09-15 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-art.el (gnus-article-edit-part): Work for the buffer configuration that provides the sole article window in a frame; position point correctly after deleting a part. 2009-09-14 Adam Sjogren <asjo@koldfront.dk> * spam.el (spam-unregister-on-reregister): Add boolean variable. (spam-resolve-registrations-routine): Use it to unregister articles that change status.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 28 Sep 2009 12:09:01 +0000
parents a9dc0e7c3f2b
children 1d1d5d9bd884
comparison
equal deleted inserted replaced
105252:2d2ad7907c5e 105253:baa4e6ac9e46
379 signer-key 379 signer-key
380 (signers 380 (signers
381 (or (message-options-get 'mml-smime-epg-signers) 381 (or (message-options-get 'mml-smime-epg-signers)
382 (message-options-set 382 (message-options-set
383 'mml-smime-epg-signers 383 'mml-smime-epg-signers
384 (if mml-smime-verbose 384 (if (eq mm-sign-option 'guided)
385 (epa-select-keys context "\ 385 (epa-select-keys context "\
386 Select keys for signing. 386 Select keys for signing.
387 If no one is selected, default secret key is used. " 387 If no one is selected, default secret key is used. "
388 mml-smime-signers t) 388 mml-smime-signers t)
389 (if mml-smime-signers 389 (if mml-smime-signers
460 (split-string 460 (split-string
461 (or (message-options-get 'message-recipients) 461 (or (message-options-get 'message-recipients)
462 (message-options-set 'message-recipients 462 (message-options-set 'message-recipients
463 (read-string "Recipients: "))) 463 (read-string "Recipients: ")))
464 "[ \f\t\n\r\v,]+")))) 464 "[ \f\t\n\r\v,]+"))))
465 (if mml-smime-verbose 465 (if (eq mm-encrypt-option 'guided)
466 (setq recipients 466 (setq recipients
467 (epa-select-keys context "\ 467 (epa-select-keys context "\
468 Select recipients for encryption. 468 Select recipients for encryption.
469 If no one is selected, symmetric encryption will be performed. " 469 If no one is selected, symmetric encryption will be performed. "
470 recipients)) 470 recipients))