[nongnu] elpa/geiser-kawa 95e3f4a 010/119: Fix error when requiring geiser-kawa and kawa binary is not in PATH

[Philip Kaludercic]

branch: elpa/geiser-kawa
commit 95e3f4a42b653adb8b57094bf50c49856424a34b
Author: spellcard199 <spellcard199@protonmail.com>
Commit: spellcard199 <spellcard199@protonmail.com>

    Fix error when requiring geiser-kawa and kawa binary is not in PATH
---
 elisp/geiser-kawa.el | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/elisp/geiser-kawa.el b/elisp/geiser-kawa.el
index 63e2580..cf7050b 100644
--- a/elisp/geiser-kawa.el
+++ b/elisp/geiser-kawa.el
@@ -102,16 +102,13 @@
   :type '(choice string (repeat string))
   :group 'geiser-kawa)
 
-;; TODO: replace file-name-directory/directory-file-name with expand-file-name
 (geiser-custom--defcustom
     geiser-kawa-manual-path
-    (concat
-     (file-name-directory
-      (directory-file-name
+    (when (executable-find geiser-kawa-binary)
+      (expand-file-name
+       "../doc/kawa-manual.epub"
        (file-name-directory
-        (directory-file-name
-         (executable-find geiser-kawa-binary)))))
-     "doc/kawa-manual.epub")
+        (executable-find geiser-kawa-binary))))
   "Path of kawa manual. Supported formats are `.epub' (using
 `eww-mode') and `.info' (using `info.el')."
   :type 'string
@@ -137,22 +134,24 @@
       geiser-kawa-binary)))
 
 (defun geiser-kawa--make-classpath ()
-  (let ((jars (append
-               (let ((lib-dir (expand-file-name
-                               "../lib/"
-                               (file-name-directory
-                                (executable-find geiser-kawa-binary)))))
-                 (if (and
-                      (not 
geiser-kawa-use-kawa-version-included-in-kawa-geiser)
-                      (executable-find geiser-kawa-binary)
-                      (file-directory-p lib-dir))
-                     (list
-                      (concat lib-dir "kawa.jar")
-                      (concat lib-dir "servlet.jar")
-                      (concat lib-dir "domterm.jar")
-                      (concat lib-dir "jline.jar"))
-                   nil))
-               (list geiser-kawa-kawa-geiser-jar-path))))
+  (let ((jars
+         (append
+          (if (and
+               (not geiser-kawa-use-kawa-version-included-in-kawa-geiser)
+               (executable-find geiser-kawa-binary))
+              (let ((lib-dir (expand-file-name
+                              "../lib/"
+                              (file-name-directory
+                               (executable-find geiser-kawa-binary)))))
+                (if (file-directory-p lib-dir)
+                    (list
+                     (concat lib-dir "kawa.jar")
+                     (concat lib-dir "servlet.jar")
+                     (concat lib-dir "domterm.jar")
+                     (concat lib-dir "jline.jar"))
+                  nil))
+            nil)
+          (list geiser-kawa-kawa-geiser-jar-path))))
     (mapconcat #'identity jars ":")))
 
 (defvar geiser-kawa--arglist