branch: externals/kiwix
commit aea0901c72873a221260857fc4eba78397bbfb55
Author: stardiviner <numbch...@gmail.com>
Commit: stardiviner <numbch...@gmail.com>
simplify Org kiwix link select library logic
---
kiwix.el | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/kiwix.el b/kiwix.el
index 3627d3e..5d990aa 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -118,9 +118,9 @@
;; - "wiktionary_zh_all" - "wiktionary_zh_all_2015-17"
;; - "wikipedia_en_medicine" - "wikipedia_en_medicine_2015-17"
-(defun kiwix-select-library ()
+(defun kiwix-select-library (&optional filter)
"Select Kiwix library name."
- (completing-read "Kiwix library: " kiwix-libraries))
+ (completing-read "Kiwix library: " kiwix-libraries nil nil filter))
(defcustom kiwix-default-library "wikipedia_en_all.zim"
"The default kiwix library when library fragment in link not specified."
@@ -128,12 +128,6 @@
:safe #'stringp
:group 'kiwix-mode)
-(defcustom kiwix-your-language-library "zh"
- "Specify the library for your navtive language."
- :type 'string
- :safe #'stringp
- :group 'kiwix-mode)
-
(defcustom kiwix-search-interactively t
"`kiwix-at-point' search interactively."
:type 'boolean
@@ -240,9 +234,9 @@ for query string and library interactively."
"Get library from Org-mode `LINK'."
(if (string-match-p "[a-zA-Z\ ]+" (match-string 2 link)) ; validate query is
English
;; convert between libraries full name and abbrev.
- (kiwix-get-library-filename (or (match-string 1 link) "default"))
+ (or (match-string 1 link) (kiwix-select-library))
;; validate query is non-English
- (kiwix-get-library-filename kiwix-your-language-library)))
+ (kiwix-select-library "zh")))
;;;###autoload
(defun org-wikipedia-link-open (link)
