[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d3437ea: Replace some obsolete functions in gnus
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master d3437ea: Replace some obsolete functions in gnus |
Date: |
Sat, 3 Mar 2018 20:18:15 -0500 (EST) |
branch: master
commit d3437eaf6777a9660d19dbec084392e8134984b7
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Replace some obsolete functions in gnus
* lisp/gnus/mml-sec.el (mml-secure-epg-encrypt):
* lisp/gnus/smime.el (smime-ask-passphrase): Replace obsolete functions.
---
lisp/gnus/mml-sec.el | 2 +-
lisp/gnus/smime.el | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index 099e537..3855d7b 100644
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -903,7 +903,7 @@ If no one is selected, symmetric encryption will be
performed. "
(defun mml-secure-epg-encrypt (protocol cont &optional sign)
;; Based on code appearing inside mml2015-epg-encrypt.
(let* ((context (epg-make-context protocol))
- (config (epg-configuration))
+ (config (epg-find-configuration 'OpenPGP))
(sender (message-options-get 'message-sender))
(recipients (mml-secure-recipients protocol context config sender))
(signer-names (mml-secure-signer-names protocol sender))
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 3e722d2..d55cea7 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -234,10 +234,11 @@ must be set in `ldap-host-parameters-alist'."
If `cache-key' and `password-cache' is non-nil then cache the
password under `cache-key'."
(let ((passphrase
- (password-read-and-add
+ (password-read
"Passphrase for secret key (RET for no passphrase): " cache-key)))
(if (string= passphrase "")
nil
+ (and passphrase cache-key (password-cache-add cache-key passphrase))
passphrase)))
;; OpenSSL wrappers.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d3437ea: Replace some obsolete functions in gnus,
Glenn Morris <=