X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;h=662e451ff7638fb23178788db045fde42338aa86;hp=8f967cfbb7516e010311f17b3fe4075a0a5bc491;hb=3cb3110e90a8f9f71bd49e6bbd2781f2e9a50285;hpb=2043d24c32ba47699ef37e95d269a54117eef679 diff --git a/elpher.el b/elpher.el index 8f967cf..662e451 100644 --- a/elpher.el +++ b/elpher.el @@ -1,4 +1,4 @@ -;;; elpher.el --- A friendly gopher and gemini client -*- lexical-binding:t -*- +;;; elpher.el --- A friendly gopher and gemini client -*- lexical-binding: t -*- ;; Copyright (C) 2021 Jens Östlund ;; Copyright (C) 2021 F. Jason Park @@ -21,8 +21,8 @@ ;; Created: 11 April 2019 ;; Version: 2.11.0 ;; Keywords: comm gopher -;; Homepage: http://thelambdalab.xyz/elpher -;; Package-Requires: ((emacs "26.2")) +;; Homepage: https://alexschroeder.ch/cgit/elpher +;; Package-Requires: ((emacs "27.1")) ;; This file is not part of GNU Emacs. @@ -63,7 +63,7 @@ ;; Elpher is under active development. Any suggestions for ;; improvements are welcome, and can be made on the official -;; project page, gopher://thelambdalab.xyz/1/projects/elpher/. +;; project page, https://alexschroeder.ch/cgit/elpher. ;;; Code: @@ -81,6 +81,7 @@ (require 'nsm) (require 'gnutls) (require 'socks) +(require 'ol) ;;; ANSI colors or XTerm colors @@ -165,8 +166,9 @@ Otherwise, use the system browser via the BROWSE-URL function." (defcustom elpher-auto-disengage-TLS nil "If non-nil, automatically disengage TLS following an unsuccessful connection. -While enabling this may seem convenient, it is also potentially dangerous as it -allows switching from an encrypted channel back to plain text without user input." +While enabling this may seem convenient, it is also potentially +dangerous as it allows switching from an encrypted channel back to +plain text without user input." :type '(boolean)) (defcustom elpher-connection-timeout 5 @@ -1074,7 +1076,7 @@ If ADDRESS is not supplied or nil the record is rendered as an (buffer-string))) (defconst elpher-ansi-regex "\x1b\\[[^m]*m" - "Wildly incomplete regexp used to strip out some troublesome ANSI escape sequences.") + "Incomplete regexp used to strip out some troublesome ANSI escape sequences.") (defun elpher-process-text-for-display (string) "Perform any desired processing of STRING prior to display as text. @@ -1471,7 +1473,7 @@ by HEADER-LINE." (defun elpher-gemini-insert-text (text-line) "Insert a plain non-preformatted TEXT-LINE into a text/gemini document. This function uses Emacs' auto-fill to wrap text sensibly to a maximum -width defined by elpher-gemini-max-fill-width." +width defined by `elpher-gemini-max-fill-width'." (string-match "\\(^[ \t]*\\)\\(\\*[ \t]+\\|>[ \t]*\\)?" text-line) (let* ((line-prefix (match-string 2 text-line)) (processed-text-line @@ -1778,8 +1780,14 @@ If ADDRESS is already bookmarked, update the label only." ;;; Integrations ;; +;; Avoid byte compilation warnings. +(eval-when-compile + (declare-function org-link-store-props "ol") + (declare-function org-link-set-parameters "ol") + (defvar thing-at-point-uri-schemes)) + (defun elpher-org-link-store () - "Store link to an `elpher' page in org-mode." + "Store link to an `elpher' page in `org'." (when (eq major-mode 'elpher-mode) (let ((link (concat "elpher:" (elpher-info-current))) (desc (car elpher-current-page))) @@ -1789,7 +1797,7 @@ If ADDRESS is already bookmarked, update the label only." t))) (defun elpher-org-link-follow (link _args) - "Follow an `elpher' link in an `org' buffer." + "Follow an `elpher' LINK in an `org' buffer." (require 'elpher) (message (concat "Got link: " link)) (when (or @@ -1798,29 +1806,22 @@ If ADDRESS is already bookmarked, update the label only." (string-match-p "^finger://.+" link)) (elpher-go (string-remove-prefix "elpher:" link)))) -(with-eval-after-load "org" - ;; Use `org-link-set-parameters' if defined (org-mode 9+) - (if (fboundp 'org-link-set-parameters) - (org-link-set-parameters "elpher" - :store #'elpher-org-link-store - :follow #'elpher-org-link-follow) - (org-add-link-type "mu4e" 'elpher-org-link-follow) - (add-hook 'org-store-link-functions 'elpher-org-link-store))) - -(defun browse-url-elpher (url &rest _args) - "Browse URL. This function is used by `browse-url'." +(org-link-set-parameters "elpher" + :store #'elpher-org-link-store + :follow #'elpher-org-link-follow) + +;;;###autoload +(defun elpher-browse-url-elpher (url &rest _args) + "Browse URL using Elpher. This function is used by `browse-url'." (interactive (browse-url-interactive-arg "Elpher URL: ")) (elpher-go url)) -(with-eval-after-load "browse-url" - ;; Use elpher to open gopher, finger and gemini links - (when (boundp 'browse-url-default-handlers) - (add-to-list 'browse-url-default-handlers - '("^\\(gopher\\|finger\\|gemini\\)://" . browse-url-elpher)))) +(add-to-list + 'browse-url-default-handlers + '("^\\(gopher\\|finger\\|gemini\\)://" . elpher-browse-url-elpher)) -(with-eval-after-load "thingatpt" - ;; Register "gemini://" as a URI scheme so `browse-url' does the right thing - (add-to-list 'thing-at-point-uri-schemes "gemini://")) +;; Register "gemini://" as a URI scheme so `browse-url' does the right thing +(add-to-list 'thing-at-point-uri-schemes "gemini://") ;;; Interactive procedures ;; @@ -1862,7 +1863,7 @@ When run interactively HOST-OR-URL is read from the minibuffer." (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." + "Visit link designated by a number N." (interactive "nLink number: ") (if (or (> n (length elpher--gemini-page-links)) (< n 1)) @@ -2191,10 +2192,10 @@ functions which initialize the gopher client, namely The buffer used for Elpher sessions is determined by the value of ‘elpher-buffer-name’. If there is already an Elpher session active in that buffer, Emacs will simply switch to it. Otherwise, a new session -will begin. A numeric prefix arg (as in ‘C-u 42 M-x elpher RET’) -switches to the session with that number, creating it if necessary. A -nonnumeric prefix arg means to create a new session. Returns the -buffer selected (or created)." +will begin. A numeric prefix ARG (as in ‘\\[universal-argument] 42 +\\[execute-extended-command] elpher RET’) switches to the session with +that number, creating it if necessary. A non numeric prefix ARG means +to create a new session. Returns the buffer selected (or created)." (interactive "P") (let* ((name (default-value 'elpher-buffer-name)) (buf (cond ((numberp arg)