From: Alex Schroeder <alex@gnu.org>
Date: Mon, 28 Jun 2021 16:44:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'etienne/fix-various' into main
X-Git-Tag: bookmarks~25
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=commitdiff_plain;h=13b60c5b3df36c65c60bb2227c998476ac0cb417;hp=221911ec7ce50468fbf6c0889321adf85cd753f5

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

diff --git a/README b/README
index 5e88e6a..a718f32 100644
--- a/README
+++ b/README
@@ -85,12 +85,26 @@ Info directory which can be displayed using "C-h i".
 Contributors
 ------------
 
-Besides myself, the following people (in no particular order) have
-generously provided assistance/patches for the impovement of elpher:
-
-* Bradley Thornton
+The following people (in alphabetical order) have generously provided
+assistance/patches for the impovement of elpher:
+
+* Alexis
+* Christopher Brannon
+* Zhiwei Chen
+* condy0919
+* Étienne Deparis
 * Roy Koushik
+* Simon Nicolussi
+* Noodles!
+* Jens Östlund
+* F. Jason Park
+* Omar Polo
+* Koushk Roy
+* Michel Alexandre Salim
+* Alex Schroeder
 * Simon South
+* Bradley Thornton
+* Tim Vaughan
 * Vee
 
 Licence
diff --git a/elpher.el b/elpher.el
index 449874d..9459c2c 100644
--- a/elpher.el
+++ b/elpher.el
@@ -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 @@ 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)
@@ -1856,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."