X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=elpher.el;h=814f0fb72cc1aa555e38ad22eefbd1aa2a48dd95;hb=1fdaea981e6b423ec6edc05f1587907cf5b9c626;hp=883bde8db02ba45545a1d2e74553d2532d5863e7;hpb=3eb647d059c6cb5b18ba3a931587c7000ef1b39e;p=elpher.git

diff --git a/elpher.el b/elpher.el
index 883bde8..814f0fb 100644
--- a/elpher.el
+++ b/elpher.el
@@ -15,7 +15,7 @@
 ;; Copyright (C) 2020 Koushk Roy <kroy@twilio.com>
 ;; Copyright (C) 2020 Vee <vee@vnsf.xyz>
 ;; Copyright (C) 2020 Simon South <simon@simonsouth.net>
-;; Copyright (C) 2019-2020 Tim Vaughan <plugd@thelambdalab.xyz>
+;; Copyright (C) 2019-2021 Tim Vaughan <plugd@thelambdalab.xyz>
 
 ;; Author: Tim Vaughan <plugd@thelambdalab.xyz>
 ;; Created: 11 April 2019
@@ -330,8 +330,6 @@ Links can be accessed by pressing `v' ('visit') followed by the link number."
         (let ((url (url-generic-parse-url url-string)))
           (unless (and (not (url-fullness url)) (url-type url))
             (setf (url-fullness url) t)
-            (setf (url-filename url)
-                  (url-unhex-string (url-filename url)))
             (unless (url-type url)
               (setf (url-type url) elpher-default-url-type))
             (unless (url-host url)
@@ -438,7 +436,7 @@ address refers to, via the table `elpher-type-map'."
 For gopher addresses this is a combination of the selector type and selector."
   (if (symbolp address)
       nil
-    (url-filename address)))
+    (url-unhex-string (url-filename address))))
 
 (defun elpher-address-host (address)
   "Retrieve host from ADDRESS object."
@@ -462,7 +460,7 @@ If no address is defined, returns 0.  (This is for compatibility with the URL li
 (defun elpher-address-gopher-p (address)
   "Return non-nill if ADDRESS object is a gopher address."
   (and (not (elpher-address-special-p address))
-       (member (elpher-address-protocol address) '("gopher gophers"))))
+       (member (elpher-address-protocol address) '("gopher" "gophers"))))
 
 (defun elpher-gopher-address-selector (address)
   "Retrieve gopher selector from ADDRESS object."
@@ -1689,8 +1687,8 @@ The result is rendered using RENDERER."
 ;; History page retrieval
 
 (defun elpher-history ()
-  "Show the history of pages leading to the current page
-in this buffer. Use \\[elpher-history-all] to see the entire history.
+  "Show the history of pages leading to the current page in this buffer.
+Use \\[elpher-history-all] to see the entire history.
 This is rendered using `elpher-get-history-page' via `elpher-type-map'."
   (interactive)
   (elpher-visit-page
@@ -1702,7 +1700,7 @@ This is rendered using `elpher-get-history-page' via `elpher-type-map'."
 Use \\[elpher-history] to see just the history for the current buffer.
 This is rendered using `elpher-get-history-all-page' via `elpher-type-map'."
   (interactive)
-  (elpher-visit-page 
+  (elpher-visit-page
    (elpher-make-page "Elpher History Of All Seen Pages"
 		     (elpher-make-special-address 'history-all))))
 
@@ -1747,7 +1745,7 @@ and \\[elpher-set-bookmark-no-overwrite] do the same thing.")
 (defun elpher-bookmark-make-record ()
   "Return a bookmark record.
 If `elpher-bookmark-link' is non-nil and point is on a link button,
-return a bookmark record for that link. Otherwise, return a bookmark
+return a bookmark record for that link.  Otherwise, return a bookmark
 record for the current elpher page."
   (let* ((button (and elpher-bookmark-link (button-at (point))))
 	 (page (if button
@@ -1779,7 +1777,7 @@ To bookmark the current page, use \\[bookmark-set-no-overwrite]."
     (bookmark-set-no-overwrite)))
 
 (defun elpher-bookmark-import (file)
-  "Import Elpher bookmarks into Emacs bookmarks."
+  "Import Elpher bookmarks file FILE into Emacs bookmarks."
   (interactive (list (if (and (boundp 'elpher-bookmarks-file)
 			      (file-readable-p elpher-bookmarks-file))
 			 elpher-bookmarks-file