From: ueno <ueno>
Date: Tue, 5 Feb 2008 07:12:28 +0000 (+0000)
Subject: Reverted a change by Hiroya Murata on 2006-12-20.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63bfdb8f2877f32314a5864565ce66b0cdd4675e;p=elisp%2Fepg.git

Reverted a change by Hiroya Murata on 2006-12-20.
---

diff --git a/ChangeLog b/ChangeLog
index 5d662ce..77ca024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-05  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa.el: Reverted a change by Hiroya Murata on 2006-12-20.
+
 2008-01-22  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa-mail.el (epa-mail--find-usable-key): New function.
diff --git a/epa.el b/epa.el
index 5e2a7d6..ec88f8e 100644
--- a/epa.el
+++ b/epa.el
@@ -500,26 +500,6 @@ If SECRET is non-nil, list secret keys instead of public keys."
 	(epa--select-keys prompt keys)
       keys)))
 
-(defun epa--format-fingerprint-1 (fingerprint unit-size block-size)
-  (let ((unit 0))
-    (with-temp-buffer
-      (insert fingerprint)
-      (goto-char (point-min))
-      (while (progn
-	       (goto-char (+ (point) unit-size))
-	       (not (eobp)))
-	(setq unit (1+ unit))
-	(insert (if (= (% unit block-size) 0) "  " " ")))
-      (buffer-string))))
-
-(defun epa--format-fingerprint (fingerprint)
-  (if fingerprint
-      (if (= (length fingerprint) 40)
-	  ;; 1234 5678 9ABC DEF0 1234  5678 9ABC DEF0 1234 5678
-	  (epa--format-fingerprint-1 fingerprint 4 5)
-	;; 12 34 56 78 9A BC DE F0  12 34 56 78 9A BC DE F0
-	(epa--format-fingerprint-1 fingerprint 2 8))))
-
 (defun epa--show-key (key)
   (let* ((primary-sub-key (car (epg-key-sub-key-list key)))
 	 (entry (assoc (epg-sub-key-id primary-sub-key)
@@ -588,7 +568,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
 			 (epg-sub-key-capability (car pointer))
 			 " ")
 	      "\n\tFingerprint: "
-	      (epa--format-fingerprint (epg-sub-key-fingerprint (car pointer)))
+	      (epg-sub-key-fingerprint (car pointer))
 	      "\n")
       (setq pointer (cdr pointer)))
     (goto-char (point-min))