X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;h=662e451ff7638fb23178788db045fde42338aa86;hp=27a0295ad01a79d8cc1dee129c319403868689de;hb=3cb3110e90a8f9f71bd49e6bbd2781f2e9a50285;hpb=70aa33aa021a46a8337348de253b83aa6a11c71c

diff --git a/elpher.el b/elpher.el
index 27a0295..662e451 100644
--- a/elpher.el
+++ b/elpher.el
@@ -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.
 
@@ -81,6 +81,7 @@
 (require 'nsm)
 (require 'gnutls)
 (require 'socks)
+(require 'ol)
 
 ;;; ANSI colors or XTerm colors
 
@@ -1779,6 +1780,12 @@ 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'."
   (when (eq major-mode 'elpher-mode)
@@ -1799,14 +1806,9 @@ 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)))
+(org-link-set-parameters "elpher"
+                         :store #'elpher-org-link-store
+                         :follow #'elpher-org-link-follow)
 
 ;;;###autoload
 (defun elpher-browse-url-elpher (url &rest _args)
@@ -1819,8 +1821,7 @@ If ADDRESS is already bookmarked, update the label only."
  '("^\\(gopher\\|finger\\|gemini\\)://" . elpher-browse-url-elpher))
 
 ;; Register "gemini://" as a URI scheme so `browse-url' does the right thing
-(with-eval-after-load 'thingatpt
-  (add-to-list 'thing-at-point-uri-schemes "gemini://"))
+(add-to-list 'thing-at-point-uri-schemes "gemini://")
 
 ;;; Interactive procedures
 ;;