[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/kiwix 6a7fc40 097/192: Merge branch 'hotfix/void-functi
From: |
Stefan Monnier |
Subject: |
[elpa] externals/kiwix 6a7fc40 097/192: Merge branch 'hotfix/void-function-org-link-set-parameters-2' |
Date: |
Sat, 19 Dec 2020 00:41:41 -0500 (EST) |
branch: externals/kiwix
commit 6a7fc402c1d46a9b7f1e7d41cceff8dedbed164c
Merge: ce7189a a613eed
Author: stardiviner <numbchild@gmail.com>
Commit: stardiviner <numbchild@gmail.com>
Merge branch 'hotfix/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)
- [elpa] externals/kiwix 5cba3b5 081/192: add a test for only capitalize the first word, (continued)
- [elpa] externals/kiwix 5cba3b5 081/192: add a test for only capitalize the first word, Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 4102205 086/192: load for `org-link-set-parameters', Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 7b8a799 088/192: Merge tag 'void-function_org-link-set-parameters' into develop, Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix e600844 089/192: fix kiwix does not contain group., Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 121d98a 093/192: fix void function org-link-set-parameters., Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 686bac6 068/192: fix query validating regexp, Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 47d968a 069/192: update add org-mode link functions to Org-mode 9.0, Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 3dab002 077/192: only capitalize the first word of string., Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 6fb8354 078/192: Merge branch 'release/v0.5.2', Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 43e0547 083/192: Merge branch 'release/v0.6.0', Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 6a7fc40 097/192: Merge branch 'hotfix/void-function-org-link-set-parameters-2',
Stefan Monnier <=
- [elpa] externals/kiwix 2ab63c9 098/192: Merge tag 'void-function-org-link-set-parameters-2' into develop, Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 6e43812 102/192: fix void functions by adding autoload cookies., Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 5aa6c3a 105/192: `string-empty-p` depends on (emacs "24.4"), Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 86dbead 107/192: add a helper function to detect kiwix profile directory accessible., Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 44a44cb 110/192: autoload org related functions, Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix f7535e0 112/192: format code, remove dangling parentheses, Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 183b133 114/192: update usage comments, Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 658038e 113/192: fix kiwix libraries data structure duplicate when re-evaluate., Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix 30559cc 116/192: add option for specifying default library, Stefan Monnier, 2020/12/19
- [elpa] externals/kiwix efcfd99 117/192: fix default libraries directory, Stefan Monnier, 2020/12/19