From: Tim Vaughan <plugd@thelambdalab.xyz>
Date: Tue, 9 Jun 2020 09:17:05 +0000 (+0200)
Subject: Revert port-stripping from elpher-address-to-url.
X-Git-Tag: v2.7.11~2
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=commitdiff_plain;h=a247f9f44f2dfd0b135ba310a8a9fe770a94ce8a;p=elpher.git

Revert port-stripping from elpher-address-to-url.

This seemed to be randomly adding the :0 port specifier
to URLs, breaking links.  The stripping should be
implemented, but this requires more thought.
---

diff --git a/elpher.el b/elpher.el
index fd0bfc6..5af8121 100644
--- a/elpher.el
+++ b/elpher.el
@@ -309,23 +309,7 @@ requiring gopher-over-TLS."
   "Get string representation of ADDRESS, or nil if ADDRESS is special."
   (if (elpher-address-special-p address)
       nil
-    (let* ((port (url-port address))
-           (address-to-convert
-            (if (= port 0)
-                address
-              (let ((address-copy (seq-copy address))
-                    (protocol (url-type address)))
-                (if (or (and (equal protocol "gopher")
-                             (= port 70))
-                        (and (equal protocol "gemini")
-                             (= port 1965))
-                        (and (equal protocol "http")
-                             (= port 80))
-                        (and (equal protocol "finger")
-                             (= port 79)))
-                    (setf (url-port address-copy) 0))
-                address-copy))))
-      (url-encode-url (url-recreate-url address-to-convert)))))
+    (url-encode-url (url-recreate-url address))))
 
 (defun elpher-address-type (address)
   "Retrieve type of ADDRESS object.