From: ueno <ueno>
Date: Tue, 25 Apr 2006 08:15:37 +0000 (+0000)
Subject: Handle errors from base64-decode-string.
X-Git-Tag: riece-3_0_0~26
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8a8274df9b1296c58f88a3902f09578477f35c63;p=elisp%2Friece.git

Handle errors from base64-decode-string.
---

diff --git a/lisp/riece-epg.el b/lisp/riece-epg.el
index 76d7c01..6d17106 100644
--- a/lisp/riece-epg.el
+++ b/lisp/riece-epg.el
@@ -65,16 +65,17 @@
       (when (string-match "\\`\\[OpenPGP Encrypted:\\(.*\\)]"
 			  (riece-message-text message))
 	(let ((context (epg-make-context))
-	      (string (riece-decode-coding-string
-		       (base64-decode-string
-			(match-string 1 (riece-message-text message)))))
+	      (string (match-string 1 (riece-message-text message)))
 	      entry)
 	  (epg-context-set-passphrase-callback
 	   context
 	   (cons #'riece-epg-passphrase-callback-function
 		 (riece-message-target message)))
 	  (condition-case error
-	      (setq string (epg-decrypt-string context string))
+	      (setq string (epg-decrypt-string
+			    context
+			    (riece-decode-coding-string
+			     (base64-decode-string string))))
 	    (error
 	     (if (setq entry (assoc (riece-message-target message)
 				    riece-epg-passphrase-alist))