X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;h=1dfdded8b0f75f5a9e360601f3baf65c4740e85e;hp=9bdc49efdcea2599bf18e0de97d87213f428696f;hb=8eb8d6707f84064d3a3cd2947ca04fe17fc3f22e;hpb=58e018e92e7c6667c9c163f13a1592248d654b53;ds=sidebyside

diff --git a/elpher.el b/elpher.el
index 9bdc49e..1dfdded 100644
--- a/elpher.el
+++ b/elpher.el
@@ -511,14 +511,17 @@ readability."
   "Return an IRI for URL.
 Decode percent-escapes and handle punycode in the domain name.
 Drop the password, if any."
-  (let* ((address (elpher-address-from-url (elpher-decode (url-unhex-string url))))
-	 (host (url-host address))
-	 (pass (url-password address)))
-    (when host
-      (setf (url-host address) (puny-decode-domain host)))
-    (when pass				 ; RFC 3986 says we should not render
-      (setf (url-password address) nil)) ; the password as clear text
-    (url-recreate-url address)))
+  (let ((data (match-data))) ; Prevent parsing clobbering match data
+    (unwind-protect
+        (let* ((address (elpher-address-from-url (elpher-decode (url-unhex-string url))))
+               (host (url-host address))
+               (pass (url-password address)))
+          (when host
+            (setf (url-host address) (puny-decode-domain host)))
+          (when pass				 ; RFC 3986 says we should not render
+            (setf (url-password address) nil)) ; the password as clear text
+          (url-recreate-url address))
+      (set-match-data data))))
 
 (defvar elpher-current-page nil
   "The current page for this Elpher buffer.")