Version bump.

[elpher.git] / elpher.el

diff --git a/elpher.el b/elpher.el
index 1988656..c135e09 100644 (file)
--- a/elpher.el
+++ b/elpher.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tim Vaughan <plugd@thelambdalab.xyz>
 ;; Created: 11 April 2019
-;; Version: 2.7.9
+;; 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.9"
+(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.
@@ -1538,11 +1522,12 @@ If ADDRESS is already bookmarked, update the label only."
   "Go to a particular gopher site HOST-OR-URL.
 When run interactively HOST-OR-URL is read from the minibuffer."
   (interactive "sGopher or Gemini URL: ")
-  (let ((page (elpher-make-page host-or-url
-                                (elpher-address-from-url host-or-url))))
+  (let* ((cleaned-host-or-url (string-trim host-or-url))
+         (address (elpher-address-from-url cleaned-host-or-url))
+         (page (elpher-make-page cleaned-host-or-url address))) 
     (switch-to-buffer "*elpher*")
     (elpher-visit-page page)
-    '()))
+    nil))
 
 (defun elpher-go-current ()
   "Go to a particular site read from the minibuffer, initialized with the current URL."