From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 26 Apr 2006 08:40:52 +0000 (+0000)
Subject: Autoload widget-convert-button.
X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=commitdiff_plain;h=43fe6182ea66f57aeea9d562c84abfeadd1ae255;ds=sidebyside

Autoload widget-convert-button.
---

diff --git a/lisp/riece-epg.el b/lisp/riece-epg.el
index 355b9c9..df66fa6 100644
--- a/lisp/riece-epg.el
+++ b/lisp/riece-epg.el
@@ -26,6 +26,7 @@
 (require 'riece-message)
 (require 'riece-identity)
 
+(autoload 'widget-convert-button "wid-edit")
 (autoload 'epg-make-context "epg")
 (autoload 'epg-decrypt-string "epg")
 (autoload 'epg-encrypt-string "epg")
@@ -63,8 +64,7 @@
 (defun riece-epg-passphrase-callback-function-for-decrypt (context key-id
 								   identity)
   (if (eq key-id 'SYM)
-      (let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist))
-	    passphrase)
+      (let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist)))
 	(if (cdr entry)
 	    (copy-sequence (cdr entry))
 	  (epg-cancel context)))
@@ -85,8 +85,7 @@
   (interactive)
   (let ((context (epg-make-context))
 	(string (buffer-substring (riece-line-beginning-position)
-				  (riece-line-end-position)))
-	entry)
+				  (riece-line-end-position))))
     (epg-context-set-passphrase-callback
      context
      (cons #'riece-epg-passphrase-callback-function
@@ -154,8 +153,7 @@
       (when (string-match "\\`\\[encrypted:\\(.*\\)]"
 			  (riece-message-text message))
 	(let ((context (epg-make-context))
-	      (string (match-string 1 (riece-message-text message)))
-	      entry)
+	      (string (match-string 1 (riece-message-text message))))
 	  (epg-context-set-passphrase-callback
 	   context
 	   (cons #'riece-epg-passphrase-callback-function-for-decrypt