[elpa] externals/kiwix 3485131 071/192: Merge branch 'develop'

[Stefan Monnier]

branch: externals/kiwix
commit 34851315ae9df84107f99236a0312ca4408838b6
Merge: 686bac6 f84b449
Author: stardiviner <numbchild@gmail.com>
Commit: stardiviner <numbchild@gmail.com>

    Merge branch 'develop'
---
 kiwix.el | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/kiwix.el b/kiwix.el
index 908ab76..4636c9b 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -284,11 +284,23 @@ for query string and library interactively."
        :link link
        :description query))))
 
+;;;###autoload
 (if kiwix-support-org-mode-link
     (progn
-      (org-add-link-type "wiki" 'org-wiki-link-open 'org-wiki-link-export)
-      ;; TODO: after fix interactive store link issue. enable this adding.
-      ;; (add-hook 'org-store-link-functions 'org-wiki-store-link t)
+      (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))
+      ;;   )
       ))