branch: externals/kiwix
commit 15a5c3c865187d7199bed8254a605db45cff6953
Author: stardiviner <[email protected]>
Commit: stardiviner <[email protected]>
make kiwix-serve server port customize option
---
README.org | 2 +-
kiwix.el | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/README.org b/README.org
index ac217c3..a5990f9 100644
--- a/README.org
+++ b/README.org
@@ -81,7 +81,7 @@ with RESTful API.
:commands (kiwix-launch-server kiwix-at-point-interactive)
:bind (:map document-prefix ("w" . kiwix-at-point-interactive))
:init (setq kiwix-server-use-docker t
- kiwix-server-url "http://127.0.0.1:8089/";
+ kiwix-server-port 8080
kiwix-default-library "wikipedia_zh_all_2015-11.zim"))
#+end_src
diff --git a/kiwix.el b/kiwix.el
index a6599ef..3627d3e 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -25,7 +25,7 @@
;; :commands (kiwix-launch-server kiwix-at-point-interactive)
;; :bind (:map document-prefix ("w" . kiwix-at-point-interactive))
;; :init (setq kiwix-server-use-docker t
-;; kiwix-server-url "http://127.0.0.1:8089/";
+;; kiwix-server-port 8080
;; kiwix-default-library "wikipedia_zh_all_2015-11.zim"))
;;; Usage:
@@ -54,9 +54,13 @@
:safe #'booleanp
:group 'kiwix-mode)
-(defcustom kiwix-server-url (if kiwix-server-use-docker
- "http://127.0.0.1:8080/";
- "http://127.0.0.1:8000/";)
+(defcustom kiwix-server-port 8000
+ "Specify default kiwix-serve server port."
+ :type 'number
+ :safe #'numberp
+ :group 'kiwix-mode)
+
+(defcustom kiwix-server-url (format "http://127.0.0.1:%s/"; kiwix-server-port)
"Specify Kiwix server URL."
:type 'string
:group 'kiwix-mode)
@@ -96,11 +100,6 @@
:type 'string
:group 'kiwix-mode)
-(defcustom kiwix-server-port "8000"
- "Specify the default Kiwix server port."
- :type 'string
- :group 'kiwix-mode)
-
(defvar kiwix-libraries
(when (kiwix-dir-detect)
(mapcar #'kiwix--get-library-name
