(defun mml2015-gpg-extract-signature-details ()
(goto-char (point-min))
- (if (and (eq mml2015-use 'gpg)
- (boundp 'gpg-unabbrev-trust-alist))
+ (if (boundp 'gpg-unabbrev-trust-alist)
(let* ((expired (re-search-forward
"^\\[GNUPG:\\] SIGEXPIRED$"
nil t))
(mm-insert-part signature))
(if (condition-case err
(prog1
- (pgg-verify-region (point-min) (point-max) signature-file t)
+ (pgg-verify-region (point-min) (point-max)
+ signature-file t)
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-details
- (with-current-buffer pgg-output-buffer
- (buffer-string))))
+ (concat (with-current-buffer pgg-output-buffer
+ (buffer-string))
+ (with-current-buffer pgg-errors-buffer
+ (buffer-string)))))
(error
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-details (mml2015-format-error err))
(delete-file signature-file)
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-info
- (with-current-buffer pgg-output-buffer
+ (with-current-buffer pgg-errors-buffer
(mml2015-gpg-extract-signature-details))))
(delete-file signature-file)
(mm-set-handle-multipart-parameter
(pgg-verify-region (point-min) (point-max) nil t))
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-details
- (with-current-buffer mml2015-result-buffer
- (buffer-string))))
+ (concat (with-current-buffer pgg-output-buffer
+ (buffer-string))
+ (with-current-buffer pgg-errors-buffer
+ (buffer-string)))))
(error
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-details (mml2015-format-error err))
nil))
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-info
- (with-current-buffer pgg-output-buffer
+ (with-current-buffer pgg-errors-buffer
(mml2015-gpg-extract-signature-details)))
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-info "Failed"))))