branch: externals/kiwix
commit 2ab63c9eb40a6e98af8c96c44f7de08346b2347b
Merge: 1d2b634 6a7fc40
Author: stardiviner <numbch...@gmail.com>
Commit: stardiviner <numbch...@gmail.com>
Merge tag 'void-function-org-link-set-parameters-2' into develop
fix void function org-link-set-parameters 2.
---
kiwix.el | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/kiwix.el b/kiwix.el
index e699f76..1ac9259 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -312,25 +312,26 @@ for query string and library interactively."
:link link
:description query))))
-(autoload 'org-link-set-parameters "org")
;;;###autoload
-(if kiwix-support-org-mode-link
- (progn
- (org-link-set-parameters "wiki"
- :follow #'org-wiki-link-open
- :store #'org-wiki-store-link
- :export #'org-wiki-link-export)
- (add-hook 'org-store-link-functions 'org-wiki-store-link t)
-
- ;; [[Wikipedia_Local:]]
- ;; (if (and
- ;; (member '("Wikipedia_Local" .
"http://127.0.0.1:8000/wikipedia_zh_all_2015-11/A/%s.html";)
org-link-abbrev-alist)
- ;; (assoc "Wikipedia_Local" org-link-abbrev-alist))
- ;;
- ;; (setq org-link-abbrev-alist
- ;; (cons '("Wikipedia_Local" .
"http://127.0.0.1:8000/wikipedia_zh_all_2015-11/A/%s.html";)
org-link-abbrev-alist))
- ;; )
- ))
+(with-eval-after-load "org"
+ (if kiwix-support-org-mode-link
+ (progn
+ (org-link-set-parameters "wiki"
+ :follow #'org-wiki-link-open
+ :store #'org-wiki-store-link
+ :export #'org-wiki-link-export)
+ (add-hook 'org-store-link-functions 'org-wiki-store-link t)
+
+ ;; [[Wikipedia_Local:]]
+ ;; (if (and
+ ;; (member '("Wikipedia_Local" .
"http://127.0.0.1:8000/wikipedia_zh_all_2015-11/A/%s.html";)
org-link-abbrev-alist)
+ ;; (assoc "Wikipedia_Local" org-link-abbrev-alist))
+ ;;
+ ;; (setq org-link-abbrev-alist
+ ;; (cons '("Wikipedia_Local" .
"http://127.0.0.1:8000/wikipedia_zh_all_2015-11/A/%s.html";)
org-link-abbrev-alist))
+ ;; )
+ )))
+
(provide 'kiwix)
