[nongnu] elpa/geiser-gauche 8ff743f641 3/3: Merge branch 'master' into 'master'

[ELPA Syncer]

branch: elpa/geiser-gauche
commit 8ff743f6416f00751e24aef8b9791501a40f5421
Merge: fd52cbaed9 96fa06aaee
Author: András Simonyi <andras.simonyi@gmail.com>
Commit: András Simonyi <andras.simonyi@gmail.com>

    Merge branch 'master' into 'master'
    
    avoid nested geiser-eval call
    
    Closes #2
    
    See merge request emacs-geiser/gauche!1
---
 geiser-gauche.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/geiser-gauche.el b/geiser-gauche.el
index ac4bc1981a..4f534ff56a 100644
--- a/geiser-gauche.el
+++ b/geiser-gauche.el
@@ -229,7 +229,10 @@
        (replace-regexp-in-string
        "{{cur-module}}"
        (if (string= module "'#f")
-           (format "'%s" (geiser-gauche--get-module))
+           (let ((cur-module (geiser-gauche--get-module)))
+             (if (eq cur-module :f)
+                 "'#f"
+               (format "'%s" cur-module)))
          module)
        (format "(eval '(geiser:eval %s '%s) (find-module 'geiser))" module 
form))))
     ;; The rest of the commands are all evaluated in the geiser module
@@ -262,9 +265,7 @@ form."
                    (looking-at geiser-gauche--module-re)
                    (re-search-forward geiser-gauche--module-re nil t))
                (geiser-gauche--get-module (match-string-no-properties 1))
-            ;; Return the REPL module as fallback
-             (geiser-gauche--get-module
-             (geiser-gauche--get-current-repl-module)))))
+             :f)))
        ((symbolp module) module)
         ((listp module) module)
         ((stringp module)