X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;h=9459c2c63613ffa0832f920214b8b08a720b58ba;hp=9fffce8a15a97036c76e29527959b772e06d3d34;hb=13b60c5b3df36c65c60bb2227c998476ac0cb417;hpb=e34b398fc4f61fa9b77c4d63ad0bf1384539d35b

diff --git a/elpher.el b/elpher.el
index 9fffce8..9459c2c 100644
--- a/elpher.el
+++ b/elpher.el
@@ -1816,7 +1816,9 @@ If ADDRESS is already bookmarked, update the label only."
   ;; Use elpher to open gopher, finger and gemini links
   (when (boundp 'browse-url-default-handlers)
     (add-to-list 'browse-url-default-handlers
-		 '("^\\(gopher\\|finger\\|gemini\\)://" . browse-url-elpher)))
+		 '("^\\(gopher\\|finger\\|gemini\\)://" . browse-url-elpher))))
+
+(with-eval-after-load "thingatpt"
   ;; Register "gemini://" as a URI scheme so `browse-url' does the right thing
   (add-to-list 'thing-at-point-uri-schemes "gemini://"))
 
@@ -1854,10 +1856,10 @@ When run interactively HOST-OR-URL is read from the minibuffer."
   "Go to a particular site read from the minibuffer, initialized with the current URL."
   (interactive)
   (let ((address (elpher-page-address elpher-current-page)))
-    (if (elpher-address-special-p address)
-        (error "Command invalid for this page")
-      (let ((url (read-string "Gopher or Gemini URL: " (elpher-address-to-url address))))
-        (elpher-visit-page (elpher-make-page url (elpher-address-from-url url)))))))
+    (let ((url (read-string "Gopher or Gemini URL: "
+                            (unless (elpher-address-special-p address)
+                              (elpher-address-to-url address)))))
+      (elpher-visit-page (elpher-make-page url (elpher-address-from-url url))))))
 
 (defun elpher-visit-gemini-numbered-link (n)
   "Visit link designated by a number."