[nongnu] elpa/geiser-kawa 80ed3e7 068/119: Update geiser version + remove geiser workaround for Cask

[Philip Kaludercic]

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

    Update geiser version + remove geiser workaround for Cask
---
 README.org           | 16 ---------------
 elisp/geiser-kawa.el | 55 ++++++++++++++++++++++++----------------------------
 2 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/README.org b/README.org
index 110bef7..1eff91b 100644
--- a/README.org
+++ b/README.org
@@ -114,19 +114,3 @@ geiser-kawa VS geiser-kawa-scheme - recap table:
 |--------------------------------+-----------------+--------------------|
 | Kawa side written with         | Kawa's Java API | Kawa Scheme        |
 | I'm going to add more features | Probably yes    | Probably not       |
-
-** Cask issue with geiser
-
-If you use geiser as a dependency in a Cask project, Cask eagerly expands the 
=define-geiser-implementation= macro with =load-file-name= having the wrong 
value. The result is that geiser implementations in geiser do not work when 
geiser is managed as a dependency by Cask.
-
-Link to the issue I've opened in Cask: 
[[https://github.com/cask/cask/issues/472]].
-
-As a (temporary?) workaround, geiser-kawa.el quotes 
=define-geiser-implementation= and wraps it an =eval= form, and that avoids:
-1. macro expansion to happen during cask-cli.el execution
-2. =load-file-name= having the wrong value of =<path-to-cask-cli.el>= instead 
of =<path-to-geiser-impl.el>=
-As a side effect, using =(require 'geiser-kawa)= instead of =(require geiser)= 
also fixes the problem for the other implementations, but for this I don't 
understand why.
-
-To summarize:
-1. geiser-kawa depends on geiser
-2. geiser as a dependency does not work with Cask (or vice-versa)
-3. If in the emacs instance started with =cask emacs= you use =(require 
'geiser-kawa)= instead of =(require 'geiser)=, geiser-kawa.el chain-requires 
geiser and (for some reason I don't understand) other geiser implementations 
start working
diff --git a/elisp/geiser-kawa.el b/elisp/geiser-kawa.el
index cb5577b..2f0d9ef 100644
--- a/elisp/geiser-kawa.el
+++ b/elisp/geiser-kawa.el
@@ -12,7 +12,7 @@
 ;; Maintainer: spellcard199 <spellcard199@protonmail.com>
 ;; Keywords: languages, kawa, scheme, geiser
 ;; Homepage: https://gitlab.com/spellcard199/geiser-kawa
-;; Package-Requires: ((emacs "26.1") (geiser "20191025.650"))
+;; Package-Requires: ((emacs "26.1") (geiser "20200406.1104"))
 ;; Version: 0.0.1
 
 ;; This file is NOT part of GNU Emacs.
@@ -398,35 +398,30 @@ Argument MOD is passed by geiser, but it's not used here."
 
 ;;; Implementation definition:
 
-(eval
- ;; (temporary?) Workaround for Cask issue. Wrapping
- ;; `define-geiser-implementation' with `eval' avoids issue
- ;; https://github.com/cask/cask/issues/472 in projects that depend on
- ;; geiser-kawa.
- '(define-geiser-implementation kawa
-    (unsupported-procedures '(find-file
-                              symbol-location
-                              module-location
-                              symbol-documentation
-                              module-exports
-                              callers
-                              callees
-                              generic-methods))
-    (binary geiser-kawa--binary)
-    (arglist geiser-kawa--parameters)
-    (version-command geiser-kawa--version-command)
-    (repl-startup geiser-kawa--repl-startup)
-    (prompt-regexp geiser-kawa--prompt-regexp)
-    (debugger-prompt-regexp nil)
-    (marshall-procedure geiser-kawa--geiser-procedure)
-    ;; TODO
-    ;; (find-module geiser-kawa--find-module nil)
-    (exit-command geiser-kawa--exit-command)
-    (import-command geiser-kawa--import-command)
-    (find-symbol-begin geiser-kawa--symbol-begin)
-    (display-error geiser-kawa--display-error)
-    (case-sensitive nil)
-    (external-help geiser-kawa--manual-look-up)))
+(define-geiser-implementation kawa
+  (unsupported-procedures '(find-file
+                            symbol-location
+                            module-location
+                            symbol-documentation
+                            module-exports
+                            callers
+                            callees
+                            generic-methods))
+  (binary geiser-kawa--binary)
+  (arglist geiser-kawa--parameters)
+  (version-command geiser-kawa--version-command)
+  (repl-startup geiser-kawa--repl-startup)
+  (prompt-regexp geiser-kawa--prompt-regexp)
+  (debugger-prompt-regexp nil)
+  (marshall-procedure geiser-kawa--geiser-procedure)
+  ;; TODO
+  ;; (find-module geiser-kawa--find-module nil)
+  (exit-command geiser-kawa--exit-command)
+  (import-command geiser-kawa--import-command)
+  (find-symbol-begin geiser-kawa--symbol-begin)
+  (display-error geiser-kawa--display-error)
+  (case-sensitive nil)
+  (external-help geiser-kawa--manual-look-up))
 
 (geiser-impl--add-to-alist 'regexp "\\.scm$" 'kawa t)
 (geiser-impl--add-to-alist 'regexp "\\.sld$" 'kawa t)