X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;h=e16c52dd06bef9df51894ce03a32b6cb355a92d5;hp=5dc0bdfbdb9702cd70079135c7d4bf0d1975e450;hb=d202f3c0d5b211b5d43a7ec3eed0f5feb82e2d7f;hpb=726707d9621c149e5e7784adb6aa8de3d5d5910c diff --git a/elpher.el b/elpher.el index 5dc0bdf..e16c52d 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 @@ -136,14 +136,14 @@ ;; ;; buffer-local -(defvar elpher--gemini-page-headings '() - "Interval variable containing list of headings on page.") +(defvar elpher--gemini-page-headings nil + "List of headings on the page.") -(defvar elpher--gemini-page-links '() - "Internal variable containing list of links on page.") +(defvar elpher--gemini-page-links nil + "List of links on the page.") (defvar elpher--gemini-page-links-cache (make-hash-table :test 'equal) - "Internal variable containing hash of addresses and page links.") + "Hash of addresses and page links.") ;;; Customization group ;; @@ -190,7 +190,7 @@ These certificates may be used for establishing authenticated TLS connections." :type '(file)) (defcustom elpher-default-url-type "gopher" - "Default URL type (i.e. schema) to assume if not explicitly given." + "Default URL type (i.e. scheme) to assume if not explicitly given." :type '(choice (const "gopher") (const "gemini"))) @@ -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 (GUS)" - (elpher-address-from-url "gemini://gus.guru/search")) + (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) @@ -1854,10 +1854,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."