(install-package): Install info.

[elisp/epg.git] / epg.el

diff --git a/epg.el b/epg.el
index 8c0b049..1b58162 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1737,6 +1737,8 @@ 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")
+       ;; Decode the UID name as a backslash escaped UTF-8 string,
+       ;; generated by GnuPG/GpgSM.
        (setq string (copy-sequence (aref (car lines) 9))
              index 0)
        (while (string-match "\"" string index)
@@ -1757,7 +1759,7 @@ signatures should be included."
                (if cert
                    (condition-case nil
                        (epg-dn-from-string string)
-                     (errror string))
+                     (error string))
                  string))
               (epg-key-user-id-list (car keys)))))
        ((equal (aref (car lines) 0) "fpr")
@@ -2557,7 +2559,7 @@ PARAMETERS is a string which tells how to create the key."
 \\([0-9A-Fa-f][0-9A-Fa-f]\\)\\)"
                         string index)
       (if (match-beginning 2)
-         (setq string (replace-match "\\2" t t string)
+         (setq string (replace-match "\\2" t nil string)
                index (1- (match-end 0)))
        (if (match-beginning 3)
            (setq string (replace-match (string (string-to-number