diff options
| -rw-r--r-- | lisp/gnus/mm-uu.el | 3 | ||||
| -rw-r--r-- | lisp/gnus/mml-sec.el | 5 | ||||
| -rw-r--r-- | lisp/gnus/mml-smime.el | 30 | ||||
| -rw-r--r-- | lisp/gnus/mml.el | 11 |
4 files changed, 19 insertions, 30 deletions
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index fec3b299407..049890e2e30 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el @@ -290,8 +290,7 @@ If PROPERTIES is non-nil, PROPERTIES are applied to the buffer, see `set-text-properties'. If PROPERTIES equals t, this means to apply the face `mm-uu-extract'." (let ((obuf (current-buffer)) - (multi (and (boundp 'enable-multibyte-characters) - enable-multibyte-characters)) + (multi enable-multibyte-characters) (coding-system buffer-file-coding-system)) (with-current-buffer (generate-new-buffer " *mm-uu*") (if multi (mm-enable-multibyte) (mm-disable-multibyte)) diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el index bc7c0ac5210..576eceecf4b 100644 --- a/lisp/gnus/mml-sec.el +++ b/lisp/gnus/mml-sec.el @@ -122,10 +122,7 @@ See Info node `(message) Security'." :group 'message :type 'boolean) -(defcustom mml-secure-passphrase-cache-expiry - (if (boundp 'password-cache-expiry) - password-cache-expiry - 16) +(defcustom mml-secure-passphrase-cache-expiry password-cache-expiry "How many seconds the passphrase is cached. Whether the passphrase is cached at all is controlled by `mml-secure-cache-passphrase'." 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)))) diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index ce152acf145..d9cf15f4970 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -1544,12 +1544,11 @@ or the `pop-to-buffer' function." (message-sort-headers) (mml-to-mime)) (if raw - (when (fboundp 'set-buffer-multibyte) - (let ((s (buffer-string))) - ;; Insert the content into unibyte buffer. - (erase-buffer) - (mm-disable-multibyte) - (insert s))) + (let ((s (buffer-string))) + ;; Insert the content into unibyte buffer. + (erase-buffer) + (mm-disable-multibyte) + (insert s)) (let ((gnus-newsgroup-charset (car message-posting-charset)) gnus-article-prepare-hook gnus-original-article-buffer gnus-displaying-mime) |