branch: elpa/geiser-kawa
commit 71f8a6961241c6bcf6685f224c4f7417948681b7
Author: spellcard...@protonmail.com <spellcard...@protonmail.com>
Commit: spellcard...@protonmail.com <spellcard...@protonmail.com>
Fix checkdoc and lint warnings in preparation for melpa recipe update
---
elisp/geiser-kawa-arglist.el | 9 ++++++---
elisp/geiser-kawa-devutil-complete.el | 4 ++--
elisp/geiser-kawa-ext-help.el | 30 ++++++++++++++++--------------
elisp/geiser-kawa-util.el | 9 ++++-----
4 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/elisp/geiser-kawa-arglist.el b/elisp/geiser-kawa-arglist.el
index 27e9b4b..7296312 100644
--- a/elisp/geiser-kawa-arglist.el
+++ b/elisp/geiser-kawa-arglist.el
@@ -40,14 +40,17 @@ If `geiser-kawa-binary' is a string, just return it."
(geiser-kawa-deps-jar-path
geiser-kawa-deps-jar-path))
"If the following conditions are true...:
-- `geiser-kawa-use-included-kawa' is nil
-- `geiser-kawa-binary' filepath exists
+- `GEISER-KAWA-USE-INCLUDED-KAWA' is nil
+- `GEISER-KAWA-BINARY' filepath exists
- the `lib' dir under `geiser-kawa-binary's parent dir exists
... then: add to classpath at repl startup:
- the 4 .jar files under the `lib' dir
- fat jar with `geiser-kawa' dependencies
... else: add to the classpath just:
-- fat jar with `geiser-kawa' dependencies"
+- fat jar with `geiser-kawa' dependencies
+
+GEISER-KAWA-DEPS-JAR-PATH defaults to the value of
+`geiser-kawa-deps-jar-path'."
(let ((jars
(append
(if (and
diff --git a/elisp/geiser-kawa-devutil-complete.el
b/elisp/geiser-kawa-devutil-complete.el
index 5126444..ba511c8 100644
--- a/elisp/geiser-kawa-devutil-complete.el
+++ b/elisp/geiser-kawa-devutil-complete.el
@@ -139,8 +139,8 @@ members of package as returned by kawa-geiser."
((null completion-type)
(message "No completions found.")
"")
- (t (error (format "[Unexpected `completion-type' value]
completion-type: %s"
- (prin1-to-string completion-type)))))))
+ (t (error "[Unexpected `completion-type' value] completion-type: %s"
+ (prin1-to-string completion-type))))))
(defun geiser-kawa-devutil-complete--code-point-from-toplevel ()
"Return an association list of data needed for completion."
diff --git a/elisp/geiser-kawa-ext-help.el b/elisp/geiser-kawa-ext-help.el
index 0205fa4..276397d 100644
--- a/elisp/geiser-kawa-ext-help.el
+++ b/elisp/geiser-kawa-ext-help.el
@@ -43,8 +43,10 @@
Rationale for using java instead of emacs:
- Kawa is already a dependency.
-- Kawa/java is more portable that using emacs' `arc-mode',
- which relies on external executables being installed."
+- Kawa/java is more portable that using Emacs' `arc-mode',
+ which relies on external executables being installed.
+
+EPUB-PATH defaults to `geiser-kawa-manual-path's value."
(with-temp-buffer
(geiser-impl--set-buffer-implementation 'kawa)
(geiser-eval--send/result
@@ -61,6 +63,7 @@ the manual are more responsive.")
(cl-defun geiser-kawa-manual--epub-search
(needle &optional (epub-path geiser-kawa-manual-path))
+ "Search for NEEDLE inside Kawa's manual at EPUB-PATH."
;; Validate args
(cl-assert (stringp needle) nil (type-of needle))
(cl-assert (stringp epub-path) nil (type-of epub-path))
@@ -100,7 +103,7 @@ the manual are more responsive.")
(cl-defun geiser-kawa-manual--info-search
(needle &optional (info-path geiser-kawa-manual-path))
- ;; Validate args
+ "Search for NEEDLE inside Kawa's manual at INFO-PATH."
(cl-assert (stringp needle) nil (type-of needle))
(cl-assert (stringp info-path) nil (type-of info-path))
(cl-assert (string-suffix-p ".info" info-path) nil info-path)
@@ -125,17 +128,16 @@ the manual are more responsive.")
Argument ID is the symbol to look for in the manual.
Argument MOD is passed by geiser, but it's not used here yet."
- (cl-assert (file-exists-p geiser-kawa-manual-path)
- nil (format
- (concat
- "Kawa's manual file specified by "
- "`geiser-kawa-manual-path' does not exist: \"%s\". "
- "You can either compile it yourself or "
- "find it inside the pre-compiled Kawa release. "
- "See: https://www.gnu.org/software/kawa/Getting-Kawa.html. "
- "When you have a copy, set the `geiser-kawa-manual-path' "
- "elisp variable to where the .info or .epub file is
located. ")
- geiser-kawa-manual-path))
+ (cl-assert
+ (file-exists-p geiser-kawa-manual-path)
+ nil (format
+ "Kawa's manual file specified by `geiser-kawa-manual-path' \
+does not exist: \"%s\". You can either compile it yourself or find it \
+inside the pre-compiled Kawa release. See: \
+https://www.gnu.org/software/kawa/Getting-Kawa.html. When you have a \
+copy, set the `geiser-kawa-manual-path' elisp variable to where the \
+.info or .epub file is located."
+ geiser-kawa-manual-path))
(cond
((string-suffix-p ".epub" geiser-kawa-manual-path)
(geiser-kawa-manual--epub-search (symbol-name id)
diff --git a/elisp/geiser-kawa-util.el b/elisp/geiser-kawa-util.el
index 3daf38e..5af2d4b 100644
--- a/elisp/geiser-kawa-util.el
+++ b/elisp/geiser-kawa-util.el
@@ -35,11 +35,10 @@ procedure in Kawa. It can be either a `list' or a
`string'."
(sexp-or-str-type (type-of sexp-or-str)))
(unless (member sexp-or-str-type
valid-types)
- (error
- (concat "Wrong type argument: Type of `sexp-or-str' is "
- (format "`%S'" sexp-or-str-type) ". "
- "Valid types for `sexp-or-str' can only be: "
- (format "%S" valid-types)))))
+ (error "Wrong type argument: Type of `sexp-or-str' is `%s'. \
+Valid types for `sexp-or-str' can only be %S"
+ sexp-or-str-type
+ valid-types)))
(let* ((code-as-str (cond ((equal (type-of sexp-or-str)
'string)
