From: ueno <ueno>
Date: Fri, 5 Jan 2007 23:43:25 +0000 (+0000)
Subject: * epg.el (epg--decode-hexstring): "\\x" -> "\\\\x".
X-Git-Tag: epg-0_0_10~14
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8d75e8761bea16919c592b7e6e8f2fe74ec47cb4;p=elisp%2Fepg.git

* epg.el (epg--decode-hexstring): "\\x" -> "\\\\x".
(epg--decode-quotedstring): Ditto.
---

diff --git a/ChangeLog b/ChangeLog
index 9607b50..04c477b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	* epg.el (epg--status-VALIDSIG): Don't set expiration-time if it
 	is "0".
 	(epg--make-sub-key-1): Ditto.
+	(epg--decode-hexstring): "\\x" -> "\\\\x".
+	(epg--decode-quotedstring): Ditto.
 
 	* pgg-epg.el (pgg-epg-encrypt-region): Ask a user whether to skip a
 	recipient whose public key is not available.
diff --git a/epg.el b/epg.el
index 02f1601..006a68d 100644
--- a/epg.el
+++ b/epg.el
@@ -2483,7 +2483,7 @@ PARAMETERS is a string which tells how to create the key."
 (defun epg--decode-hexstring (string)
   (let ((index 0))
     (while (eq index (string-match "[0-9A-Fa-f][0-9A-Fa-f]" string index))
-      (setq string (replace-match "\\x\\&" t nil string)
+      (setq string (replace-match "\\\\x\\&" t nil string)
 	    index (+ index 4)))
     (car (read-from-string (concat "\"" string "\"")))))
 
@@ -2496,7 +2496,7 @@ PARAMETERS is a string which tells how to create the key."
 	  (setq string (replace-match "\\2" t nil string)
 		index (1+ index))
 	(if (match-beginning 3)
-	    (setq string (replace-match "\\x\\3" t nil string)
+	    (setq string (replace-match "\\\\x\\3" t nil string)
 		  index (+ index 4))
 	  (setq string (replace-match "\\\\\\\\\\4" t nil string)
 		index (+ index 3)))))