X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmml2015.el;h=b86a2e102e3c5dd5a0fc6c594bc7451136f81811;hb=72d4e01800a11f08c04173e1868a8683070e0463;hp=5c88821b9d21389793b4f19276347c39e7fbac69;hpb=3738187cad20787b5b99c4061256e30e19ee721a;p=elisp%2Fgnus.git-

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 5c88821..b86a2e1 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -29,6 +29,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(eval-when-compile (require 'gnus-clfns))
 (require 'mm-decode)
 
 (defvar mml2015-use (or
@@ -318,8 +319,8 @@ by you.")
       (mc-encrypt-generic
        (or (message-options-get 'message-recipients)
 	   (message-options-set 'message-recipients
-			      (mc-cleanup-recipient-headers
-			       (read-string "Recipients: "))))
+				(mc-cleanup-recipient-headers
+				 (read-string "Recipients: "))))
        nil nil nil
        (message-options-get 'message-sender))))
   (goto-char (point-min))
@@ -390,9 +391,9 @@ by you.")
 
 (defun mml2015-gpg-pretty-print-fpr (fingerprint)
   (let* ((result "")
-         (fpr-length (string-width fingerprint))
-         (n-slice 0)
-         slice)
+	 (fpr-length (string-width fingerprint))
+	 (n-slice 0)
+	 slice)
     (setq fingerprint (string-to-list fingerprint))
     (while fingerprint
       (setq fpr-length (- fpr-length 4))
@@ -400,13 +401,13 @@ by you.")
       (setq fingerprint (nthcdr 4 fingerprint))
       (setq n-slice (1+ n-slice))
       (setq result
-            (concat
-             result
-             (case n-slice
-               (1  slice)
-               (otherwise (concat " " slice))))))
+	    (concat
+	     result
+	     (case n-slice
+	       (1  slice)
+	       (otherwise (concat " " slice))))))
     result))
-          
+
 (defun mml2015-gpg-extract-signature-details ()
   (goto-char (point-min))
   (if (boundp 'gpg-unabbrev-trust-alist)
@@ -414,14 +415,14 @@ by you.")
 			   "^\\[GNUPG:\\] GOODSIG [0-9A-Za-z]* \\(.*\\)$"
 			   nil t)
 			  (match-string 1)))
-         (fprint (and (re-search-forward
-		       "^\\[GNUPG:\\] VALIDSIG \\([0-9a-zA-Z]*\\) "
+	     (fprint (and (re-search-forward
+			   "^\\[GNUPG:\\] VALIDSIG \\([0-9a-zA-Z]*\\) "
 		       nil t)
-                      (match-string 1)))
-         (trust  (and (re-search-forward "^\\[GNUPG:\\] \\(TRUST_.*\\)$" nil t)
-                      (match-string 1)))
-         (trust-good-enough-p
-	  (cdr (assoc (cdr (assoc trust gpg-unabbrev-trust-alist))
+			  (match-string 1)))
+	     (trust  (and (re-search-forward "^\\[GNUPG:\\] \\(TRUST_.*\\)$" nil t)
+			  (match-string 1)))
+	     (trust-good-enough-p
+	      (cdr (assoc (cdr (assoc trust gpg-unabbrev-trust-alist))
 		      mml2015-trust-boundaries-alist))))
 	(if (and signer trust fprint)
 	    (concat signer
@@ -475,20 +476,20 @@ by you.")
 		    (error
 		     (mm-set-handle-multipart-parameter
 		      mm-security-handle 'gnus-details (mml2015-format-error err))
-                     (mm-set-handle-multipart-parameter
-                      mm-security-handle 'gnus-info "Error.")
-                     (setq info-is-set-p t)
+		     (mm-set-handle-multipart-parameter
+		      mm-security-handle 'gnus-info "Error.")
+		     (setq info-is-set-p t)
 		     nil)
 		    (quit
 		     (mm-set-handle-multipart-parameter
 		      mm-security-handle 'gnus-details "Quit.")
-                     (mm-set-handle-multipart-parameter
-                      mm-security-handle 'gnus-info "Quit.")
-                     (setq info-is-set-p t)
+		     (mm-set-handle-multipart-parameter
+		      mm-security-handle 'gnus-info "Quit.")
+		     (setq info-is-set-p t)
 		     nil))
-            (unless info-is-set-p
-              (mm-set-handle-multipart-parameter
-               mm-security-handle 'gnus-info "Failed"))
+	    (unless info-is-set-p
+	      (mm-set-handle-multipart-parameter
+	       mm-security-handle 'gnus-info "Failed"))
 	    (throw 'error handle)))
 	(mm-set-handle-multipart-parameter
 	 mm-security-handle 'gnus-info