From: Simon Josefsson <jas@extundo.com>
Date: Thu, 26 Sep 2002 17:03:40 +0000 (+0000)
Subject: (mml2015-pgg-decrypt): Only add security information
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=477c822e89a88112929420ac85e029c9e031a33d;p=gnus

(mml2015-pgg-decrypt): Only add security information
if dissecting resulting buffer actually had any information.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a704ef7ab..59b9a2061 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-26  Simon Josefsson  <jas@extundo.com>
+
+	* mml2015.el (mml2015-pgg-decrypt): Only add security information
+	if dissecting resulting buffer actually had any information.
+
 2002-09-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-group.el (gnus-group-sort-by-method): Remove `symbol-name'
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index dc304d4d4..1b6349714 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -662,8 +662,9 @@ by you.")
 	(if (condition-case err
 		(prog1
 		    (pgg-decrypt-region (point-min) (point-max))
-		  (setq decrypt-status (with-current-buffer mml2015-result-buffer
-					 (buffer-string))))
+		  (setq decrypt-status 
+			(with-current-buffer mml2015-result-buffer
+			  (buffer-string))))
 	      (error
 	       (mm-set-handle-multipart-parameter
 		mm-security-handle 'gnus-details (mml2015-format-error err))
@@ -679,7 +680,10 @@ by you.")
 	       mm-security-handle 'gnus-info "OK")
 	      (mm-set-handle-multipart-parameter
 	       mm-security-handle 'gnus-details
-	       (concat decrypt-status "\n" (mm-handle-multipart-ctl-parameter handles 'gnus-details)))
+	       (concat decrypt-status
+		       (when (stringp (car handles))
+			 "\n" (mm-handle-multipart-ctl-parameter
+			       handles 'gnus-details))))
 	      (if (listp (car handles))
 		  handles
 		(list handles)))