From: tomo <tomo>
Date: Tue, 19 Dec 2000 06:24:07 +0000 (+0000)
Subject: (pgg-format-key-identifier): Don't use `string-to-int-list'.
X-Git-Tag: semi21-1_14_0-1~12
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34a709c8e52f7e780bda9386de48b6292c057dcb;p=elisp%2Flemi.git

(pgg-format-key-identifier): Don't use `string-to-int-list'.
(pgg-read-bytes): Likewise.
(pgg-read-body): Likewise.
---

diff --git a/mime/pgg-parse.el b/mime/pgg-parse.el
index 89003d9..f3aec73 100644
--- a/mime/pgg-parse.el
+++ b/mime/pgg-parse.el
@@ -104,8 +104,11 @@
   "Armor headers.")
 
 (defmacro pgg-format-key-identifier (string)
-  `(upcase (apply #'format "%02x%02x%02x%02x%02x%02x%02x%02x"
-		  (string-to-int-list ,string))))
+  `(mapconcat (lambda (c) (format "%02X" (char-int c)))
+	      ,string "")
+  ;; `(upcase (apply #'format "%02x%02x%02x%02x%02x%02x%02x%02x"
+  ;;                 (string-to-int-list ,string)))
+  )
 
 (defmacro pgg-parse-time-field (bytes)
   `(list (logior (lsh (car ,bytes) 8)
@@ -126,7 +129,9 @@
 	      (forward-char ,nbytes))))
 
 (defmacro pgg-read-bytes (nbytes)
-  `(string-to-int-list (pgg-read-bytes-string ,nbytes)))
+  `(mapcar #'char-int (pgg-read-bytes-string ,nbytes))
+  ;; `(string-to-int-list (pgg-read-bytes-string ,nbytes))
+  )
 
 (defmacro pgg-read-body-string (ptag)
   `(if (nth 1 ,ptag)
@@ -134,7 +139,9 @@
      (pgg-read-bytes-string (- (point-max) (point)))))
 
 (defmacro pgg-read-body (ptag)
-  `(string-to-int-list (pgg-read-body-string ,ptag)))
+  `(mapcar #'char-int (pgg-read-body-string ,ptag))
+  ;; `(string-to-int-list (pgg-read-body-string ,ptag))
+  )
 
 (defalias 'pgg-skip-bytes 'forward-char)