From 206df47b5420f18516f0c9e83bc187dea6662e13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=89tienne=20Deparis?= Date: Wed, 30 Jun 2021 09:03:30 +0200 Subject: [PATCH 1/1] Add back with-eval-after-load - It avoid non-mandatory requirements - Use feature instead of filename for with-eval-after-load, compared to the historic implementation --- elpher.el | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/elpher.el b/elpher.el index 662e451..f0770de 100644 --- a/elpher.el +++ b/elpher.el @@ -81,7 +81,6 @@ (require 'nsm) (require 'gnutls) (require 'socks) -(require 'ol) ;;; ANSI colors or XTerm colors @@ -1806,9 +1805,10 @@ If ADDRESS is already bookmarked, update the label only." (string-match-p "^finger://.+" link)) (elpher-go (string-remove-prefix "elpher:" link)))) -(org-link-set-parameters "elpher" - :store #'elpher-org-link-store - :follow #'elpher-org-link-follow) +(with-eval-after-load 'org + (org-link-set-parameters "elpher" + :store #'elpher-org-link-store + :follow #'elpher-org-link-follow)) ;;;###autoload (defun elpher-browse-url-elpher (url &rest _args) @@ -1816,12 +1816,15 @@ If ADDRESS is already bookmarked, update the label only." (interactive (browse-url-interactive-arg "Elpher URL: ")) (elpher-go url)) -(add-to-list - 'browse-url-default-handlers - '("^\\(gopher\\|finger\\|gemini\\)://" . elpher-browse-url-elpher)) +;; Use elpher to open gopher, finger and gemini links +(with-eval-after-load 'browse-url + (add-to-list + 'browse-url-default-handlers + '("^\\(gopher\\|finger\\|gemini\\)://" . elpher-browse-url-elpher))) ;; Register "gemini://" as a URI scheme so `browse-url' does the right thing -(add-to-list 'thing-at-point-uri-schemes "gemini://") +(with-eval-after-load 'thingatpt + (add-to-list 'thing-at-point-uri-schemes "gemini://")) ;;; Interactive procedures ;; -- 2.20.1