Undo the last change.

diff --git a/ChangeLog b/ChangeLog
index f59b28a..172f898 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,6 @@
        * epg.el (epg--start): Don't specify --use-agent if the protocol
        is CMS; set coding-system-for-read to binary.
        (epg--status-*SIG): Decode user-id.
-       (epg--list-keys-1): Set coding-system-for-read to binary.
-       (epg-list-keys): Decode user-id.
 
 2007-02-02  Daiki Ueno  <ueno@unixuser.org>
 

diff --git a/epg.el b/epg.el
index 491ef30..802400f 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1661,7 +1661,6 @@ This function is for internal use only."
                      (unless (eq (epg-context-protocol context) 'CMS)
                        '("--fixed-list-mode"))
                      (if name (list name))))
-       (coding-system-for-read 'binary)
        keys string field index)
     (with-temp-buffer
       (apply #'call-process
@@ -1725,22 +1724,17 @@ signatures should be included."
         (cons (epg--make-sub-key-1 (car lines))
               (epg-key-sub-key-list (car keys)))))
        ((equal (aref (car lines) 0) "uid")
-       (setq user-id-string (if cert
-                                (condition-case nil
-                                    (epg-dn-from-string (aref (car lines) 9))
-                                  (error (aref (car lines) 9)))
-                              (aref (car lines) 9)))
-       (condition-case nil
-           (setq user-id-string (epg--decode-coding-string user-id-string
-                                                           'utf-8))
-         (error))
        (epg-key-set-user-id-list
         (car keys)
         (cons (epg-make-user-id
                (if (aref (car lines) 1)
                    (cdr (assq (string-to-char (aref (car lines) 1))
                               epg-key-validity-alist)))
-               user-id-string)
+               (if cert
+                   (condition-case nil
+                       (epg-dn-from-string (aref (car lines) 9))
+                     (error (aref (car lines) 9)))
+                 (aref (car lines) 9)))
               (epg-key-user-id-list (car keys)))))
        ((equal (aref (car lines) 0) "fpr")
        (epg-sub-key-set-fingerprint (car (epg-key-sub-key-list (car keys)))