From: plugd Date: Wed, 21 Jul 2021 16:19:51 +0000 (+0200) Subject: Merge patches curated by Alex. X-Git-Tag: v3.0.0~22 X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=commitdiff_plain;h=9d01af376d0575afba1593e982e57b859209d217;hp=4377906f926e321e65e3a768750a14ef79c36247 Merge patches curated by Alex. --- diff --git a/elpher.el b/elpher.el index 883bde8..245d301 100644 --- a/elpher.el +++ b/elpher.el @@ -15,7 +15,7 @@ ;; Copyright (C) 2020 Koushk Roy ;; Copyright (C) 2020 Vee ;; Copyright (C) 2020 Simon South -;; Copyright (C) 2019-2020 Tim Vaughan +;; Copyright (C) 2019-2021 Tim Vaughan ;; Author: Tim Vaughan ;; 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."