Merge remote-tracking branch 'etienne/fix-various' into main

diff --combined elpher.el
index 449874d,e16c52d..9459c2c
--- 1/elpher.el
--- 2/elpher.el
+++ b/elpher.el
@@@ -103,7 -103,7 +103,7 @@@
  ;;; Global constants
  ;;
  
- (defconst elpher-version "2.10.2"
+ (defconst elpher-version "2.11.0"
    "Current version of elpher.")
  
  (defconst elpher-margin-width 6
@@@ -1638,8 -1638,8 +1638,8 @@@ The result is rendered using RENDERER.
             "Alternatively, select a search engine and enter some search terms:\n")
     (elpher-insert-index-record "Gopher Search Engine (Veronica-2)"
                                 (elpher-make-gopher-address ?7 "/v2/vs" "gopher.floodgap.com" 70))
-    (elpher-insert-index-record "Gemini Search Engine"
-                                (elpher-address-from-url "gemini://geminispace.info"))
+    (elpher-insert-index-record "Gemini Search Engine (geminispace.info)"
+                                (elpher-address-from-url "gemini://geminispace.info/search"))
     (insert "\n"
             "This page contains your bookmarked sites (also visit with B):\n")
     (elpher-insert-index-record "Your Bookmarks" 'bookmarks)
@@@ -1816,9 -1816,7 +1816,9 @@@ If ADDRESS is already bookmarked, updat
    ;; 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://"))
  
@@@ -1856,10 -1854,10 +1856,10 @@@ When run interactively HOST-OR-URL is r
    "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."