branch: externals/kiwix commit 90658b742e09b0daae5aacb9e246a085ec224abd Author: stardiviner <numbch...@gmail.com> Commit: stardiviner <numbch...@gmail.com>
support old format library name [[wiki:(en|zh):query][description]] --- README.org | 2 +- kiwix.el | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.org b/README.org index 68f20ae..f76677b 100644 --- a/README.org +++ b/README.org @@ -77,4 +77,4 @@ The link format is like this: [[wiki:(library):search][description]] #+END_EXAMPLE -The =(library)= can be =wikipedia_en=, =wikipedia_zh=, =wiktionary_en= etc. +The =(library)= can be =wikipedia_en=, =wikipedia_zh=, =wiktionary_en=, or =en=, =zh= etc. diff --git a/kiwix.el b/kiwix.el index 57523cd..5f6a427 100644 --- a/kiwix.el +++ b/kiwix.el @@ -107,14 +107,20 @@ "The default kiwix library when library fragment in link not specified.") ;; add default key-value pair to libraries alist. -(defvar kiwix-default-library-cons - (cons "default" (kiwix-get-library-fullname kiwix-default-library))) +(dolist + (cons (list + (cons "default" (kiwix-get-library-fullname kiwix-default-library)) + (cons "en" (kiwix-get-library-fullname kiwix-default-library)) + (cons "zh" (kiwix-get-library-fullname "wikipedia_zh")))) + + (push cons kiwix-libraries-abbrev-alist) + ) -;; add `kiwix-default-library-cons' to alist. -(push kiwix-default-library-cons kiwix-libraries-abbrev-alist) ;; test ;; (kiwix-get-library-fullname "wikipedia_en") ;; (kiwix-get-library-fullname "default") +;; (kiwix-get-library-fullname "en") +;; (kiwix-get-library-fullname "zh") (defun kiwix-select-library-name () "Select Wikipedia library name abbrev."