diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-14 14:42:26 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-14 14:42:26 +1100 |
| commit | f3cdf9c23b79b242a6a313744686ed29cc16950b (patch) | |
| tree | ccdd7c700f264b4017d82cfbd2bcabf2d8ad7f66 /lisp/gnus/mml-smime.el | |
| parent | 8f597e90f6c7b1f1cae0096f66a335df01b0e6f9 (diff) | |
| download | emacs-f3cdf9c23b79b242a6a313744686ed29cc16950b.tar.gz | |
Remove compat code from some mml files
* lisp/gnus/mml-sec.el (mml-secure-passphrase-cache-expiry):
Remove compat code.
* lisp/gnus/mml-smime.el (mml-smime-openssl-sign-query):
Always use `mail-extract-address-components', since this isn't
time critical.
(mml-smime-get-dns-cert): Ditto.
* lisp/gnus/mml.el (mml-preview): Remove compat code.
Diffstat (limited to 'lisp/gnus/mml-smime.el')
| -rw-r--r-- | lisp/gnus/mml-smime.el | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index f7cf71adf62..02e602ce77f 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -175,15 +175,12 @@ Whether the passphrase is cached at all is controlled by (list 'keyfile (if (= (length smime-keys) 1) (cadar smime-keys) - (or (let ((from (cadr (funcall (if (boundp - 'gnus-extract-address-components) - gnus-extract-address-components - 'mail-extract-address-components) - (or (save-excursion - (save-restriction - (message-narrow-to-headers) - (message-fetch-field "from"))) - ""))))) + (or (let ((from (cadr (mail-extract-address-components + (or (save-excursion + (save-restriction + (message-narrow-to-headers) + (message-fetch-field "from"))) + ""))))) (and from (smime-get-key-by-email from))) (smime-get-key-by-email (gnus-completing-read "Sign this part with what signature" @@ -204,15 +201,12 @@ Whether the passphrase is cached at all is controlled by (while (not result) (setq who (read-from-minibuffer (format "%sLookup certificate for: " (or bad "")) - (cadr (funcall (if (boundp - 'gnus-extract-address-components) - gnus-extract-address-components - 'mail-extract-address-components) - (or (save-excursion - (save-restriction - (message-narrow-to-headers) - (message-fetch-field "to"))) - ""))))) + (cadr (mail-extract-address-components + (or (save-excursion + (save-restriction + (message-narrow-to-headers) + (message-fetch-field "to"))) + ""))))) (if (setq cert (smime-cert-by-dns who)) (setq result (list 'certfile (buffer-name cert))) (setq bad (format-message "`%s' not found. " who)))) |