summaryrefslogtreecommitdiff
path: root/lisp/gnus/mm-decode.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-09-23 21:55:27 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-09-23 21:55:27 +0200
commit825fd4d34165e5edc718a9df93838a410d25ea81 (patch)
treea667b23f7a464223c5641109927b87f0628a2721 /lisp/gnus/mm-decode.el
parent8b8942da0b3f76f40ae58e3e81a07e7452d7ca48 (diff)
downloademacs-825fd4d34165e5edc718a9df93838a410d25ea81.tar.gz
Fix regression in mm-possibly-verify-or-decrypt by previous patch
* lisp/gnus/mm-decode.el (mm-possibly-verify-or-decrypt): Be less strict about what's considered a success.
Diffstat (limited to 'lisp/gnus/mm-decode.el')
-rw-r--r--lisp/gnus/mm-decode.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index b6e2a68d556..f386f62f7e8 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1741,16 +1741,19 @@ If RECURSIVE, search recursively."
(format "Unknown encrypt protocol (%s)" protocol)))))))
(let ((info (get-text-property 0 'gnus-info (car mm-security-handle))))
(if (or (not info)
+ (equal info "")
(member "OK" (split-string info "\n")))
parts
+ (debug mm-security-handle)
;; We had an error during decryption. Report what it is.
(list
(mm-make-handle
(with-current-buffer (generate-new-buffer " *mm*")
(insert "Error! Result from decryption:\n\n"
info "\n\n"
- (get-text-property 0 'gnus-details
- (car mm-security-handle)))
+ (or (get-text-property 0 'gnus-details
+ (car mm-security-handle))
+ ""))
(current-buffer))
'("text/plain")))))))