branch: elpa/orgit
commit aca87a645eb26b7bd11a086e0ff119d521f7920c
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Avoid loading Magit whenever Org is loaded
Magit was loaded because Orgit autoloaded calls to the autoloaded
`orgit-link-set-parameters'. These calls are only evaluated after
Org is loaded but then it has to load Orgit to make that function
available and doing that loads Magit, which is slow.
Fix that by using `org-link-set-parameters' directly instead of our
wrapper `orgit-link-set-parameters'. The latter was only necessary
to support Org versions before v9.0, but since we now depend on at
least Org v9.4 it no longer serves a purpose.
---
orgit.el | 41 +++++++++++++++--------------------------
1 file changed, 15 insertions(+), 26 deletions(-)
diff --git a/orgit.el b/orgit.el
index 4e597ddc70..72aea36c7b 100644
--- a/orgit.el
+++ b/orgit.el
@@ -101,17 +101,6 @@
(eval-when-compile
(require 'subr-x))
-;;;###autoload
-(defun orgit-link-set-parameters (type &rest parameters)
- (if (fboundp 'org-link-set-parameters) ; since v9.0
- (apply #'org-link-set-parameters type parameters)
- (with-no-warnings
- (org-add-link-type type
- (plist-get parameters :follow)
- (plist-get parameters :export))
- (add-hook 'org-store-link-functions
- (plist-get parameters :store)))))
-
;;; Options
(defgroup orgit nil
@@ -263,11 +252,11 @@ the git-show(1) manpage. The second pass accepts these
specs:
;;;###autoload
(with-eval-after-load 'org
- (orgit-link-set-parameters "orgit"
- :store 'orgit-status-store
- :follow 'orgit-status-open
- :export 'orgit-status-export
- :complete 'orgit-status-complete-link))
+ (org-link-set-parameters "orgit"
+ :store 'orgit-status-store
+ :follow 'orgit-status-open
+ :export 'orgit-status-export
+ :complete 'orgit-status-complete-link))
;;;###autoload
(defun orgit-status-store ()
@@ -299,11 +288,11 @@ In that case `orgit-rev-store' stores one or more links
instead."
;;;###autoload
(with-eval-after-load 'org
- (orgit-link-set-parameters "orgit-log"
- :store 'orgit-log-store
- :follow 'orgit-log-open
- :export 'orgit-log-export
- :complete 'orgit-log-complete-link))
+ (org-link-set-parameters "orgit-log"
+ :store 'orgit-log-store
+ :follow 'orgit-log-open
+ :export 'orgit-log-export
+ :complete 'orgit-log-complete-link))
;;;###autoload
(defun orgit-log-store ()
@@ -363,11 +352,11 @@ In that case `orgit-rev-store' stores one or more links
instead."
;;;###autoload
(with-eval-after-load 'org
- (orgit-link-set-parameters "orgit-rev"
- :store 'orgit-rev-store
- :follow 'orgit-rev-open
- :export 'orgit-rev-export
- :complete 'orgit-rev-complete-link))
+ (org-link-set-parameters "orgit-rev"
+ :store 'orgit-rev-store
+ :follow 'orgit-rev-open
+ :export 'orgit-rev-export
+ :complete 'orgit-rev-complete-link))
;;;###autoload
(defun orgit-rev-store ()
