X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;h=cca05b8502d1a3daf72a0ea0b0e1e9b86c2db5fd;hp=fd0bfc69d7ceb3513c14acfd75600c746d9cd53b;hb=755a375d1fe78be3c1ad35cd516ac38faaf0e0d6;hpb=14dbac775058d49adb12cb4ad093d567ea80394b

diff --git a/elpher.el b/elpher.el
index fd0bfc6..cca05b8 100644
--- a/elpher.el
+++ b/elpher.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tim Vaughan <plugd@thelambdalab.xyz>
 ;; Created: 11 April 2019
-;; Version: 2.7.10
+;; Version: 2.7.11
 ;; Keywords: comm gopher
 ;; Homepage: http://thelambdalab.xyz/elpher
 ;; Package-Requires: ((emacs "26"))
@@ -70,7 +70,7 @@
 ;;; Global constants
 ;;
 
-(defconst elpher-version "2.7.10"
+(defconst elpher-version "2.7.11"
   "Current version of elpher.")
 
 (defconst elpher-margin-width 6
@@ -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.
@@ -723,7 +707,7 @@ displayed.  The _WINDOW argument is currently unused."
                (address (elpher-page-address page)))
           (format "mouse-1, RET: open '%s'" (if (elpher-address-special-p address)
                                                 address
-                                              (url-recreate-url address))))))))
+                                              (elpher-address-to-url address))))))))
 
 (defun elpher-insert-index-record (display-string &optional address)
   "Function to insert an index record into the current buffer.