]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix regression in mm-possibly-verify-or-decrypt by previous patch
authorLars Ingebrigtsen <larsi@gnus.org>
Mon, 23 Sep 2019 19:55:27 +0000 (21:55 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Mon, 23 Sep 2019 19:55:27 +0000 (21:55 +0200)
* lisp/gnus/mm-decode.el (mm-possibly-verify-or-decrypt): Be less
strict about what's considered a success.

lisp/gnus/mm-decode.el

index b6e2a68d5561ce38730c4084e75bbbf46c66ebf5..f386f62f7e8b3e561098f23b81eb730202f3f120 100644 (file)
@@ -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")))))))