From: plugd <plugd@thelambdalab.xyz>
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?a=commitdiff_plain;h=9d01af376d0575afba1593e982e57b859209d217;p=elpher.git

Merge patches curated by Alex.
---

9d01af376d0575afba1593e982e57b859209d217
diff --cc elpher.el
index a107f07,883bde8..245d301
--- a/elpher.el
+++ b/elpher.el
@@@ -1,6 -1,21 +1,21 @@@
- ;;; elpher.el --- A friendly gopher and gemini client  -*- lexical-binding:t -*-
- 
- ;; Copyright (C) 2019-2020 Tim Vaughan
+ ;;; elpher.el --- A friendly gopher and gemini client  -*- lexical-binding: t -*-
+ 
+ ;; Copyright (C) 2021 Jens Östlund <jostlund@gmail.com>
+ ;; Copyright (C) 2021 F. Jason Park <jp@neverwas.me>
+ ;; Copyright (C) 2021 Christopher Brannon <chris@the-brannons.com>
+ ;; Copyright (C) 2021 Omar Polo <op@omarpolo.com>
+ ;; Copyright (C) 2021 Noodles! <nnoodle@chiru.no>
+ ;; Copyright (C) 2020-2021 Alex Schroeder <alex@gnu.org>
+ ;; Copyright (C) 2020 Zhiwei Chen <chenzhiwei03@kuaishou.com>
+ ;; Copyright (C) 2020 condy0919 <condy0919@gmail.com>
+ ;; Copyright (C) 2020 Alexis <flexibeast@gmail.com>
+ ;; Copyright (C) 2020 Étienne Deparis <etienne@depar.is>
+ ;; Copyright (C) 2020 Simon Nicolussi <sinic@sinic.name>
+ ;; Copyright (C) 2020 Michel Alexandre Salim <michel@michel-slm.name>
+ ;; 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
@@@ -269,8 -330,17 +330,15 @@@ Links can be accessed by pressing `v' (
          (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) "gopher"))
+               (setf (url-type url) elpher-default-url-type))
+             (unless (url-host url)
+               (let ((p (split-string (url-filename url) "/" nil nil)))
+                 (setf (url-host url) (car p))
+                 (setf (url-filename url)
+                       (if (cdr p)
+                           (concat "/" (mapconcat #'identity (cdr p) "/"))
+                         ""))))
              (when (or (equal "gopher" (url-type url))
                        (equal "gophers" (url-type url)))
                ;; Gopher defaults