[nongnu] elpa/geiser-kawa 6495077 064/119: Fix: replace lang.getEnvironment() with Environment.user() as default environment

[Philip Kaludercic]

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

    Fix: replace lang.getEnvironment() with Environment.user() as default 
environment
---
 src/main/java/kawageiser/GeiserAutodoc.java        | 2 +-
 src/main/java/kawageiser/GeiserCompleteModule.java | 3 +--
 src/main/java/kawageiser/GeiserLoadFile.java       | 4 ++--
 src/main/java/kawageiser/GeiserMacroexpand.java    | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/kawageiser/GeiserAutodoc.java 
b/src/main/java/kawageiser/GeiserAutodoc.java
index f8eb35a..9e2a726 100644
--- a/src/main/java/kawageiser/GeiserAutodoc.java
+++ b/src/main/java/kawageiser/GeiserAutodoc.java
@@ -58,7 +58,7 @@ public class GeiserAutodoc {
 
     public static String autodoc(LList ids) {
         Language language = Language.getDefaultLanguage();
-        return autodoc(ids, language, language.getEnvironment());
+        return autodoc(ids, language, Environment.user());
     }
 
     public static String autodoc(LList ids, Environment env) {
diff --git a/src/main/java/kawageiser/GeiserCompleteModule.java 
b/src/main/java/kawageiser/GeiserCompleteModule.java
index 4a7d1f4..18db1b9 100644
--- a/src/main/java/kawageiser/GeiserCompleteModule.java
+++ b/src/main/java/kawageiser/GeiserCompleteModule.java
@@ -5,7 +5,6 @@
 
 package kawageiser;
 
-import gnu.expr.Language;
 import gnu.lists.LList;
 import gnu.mapping.Environment;
 import gnu.mapping.NamedLocation;
@@ -16,7 +15,7 @@ import java.util.ArrayList;
 public class GeiserCompleteModule {
 
     public static String completeModule(String prefix) {
-        return completeModule(prefix, 
Language.getDefaultLanguage().getEnvironment());
+        return completeModule(prefix, Environment.user());
     }
 
     public static String completeModule(String prefix, Environment env) {
diff --git a/src/main/java/kawageiser/GeiserLoadFile.java 
b/src/main/java/kawageiser/GeiserLoadFile.java
index 6904c84..e9f64b6 100644
--- a/src/main/java/kawageiser/GeiserLoadFile.java
+++ b/src/main/java/kawageiser/GeiserLoadFile.java
@@ -5,15 +5,15 @@
 
 package kawageiser;
 
-import gnu.expr.Language;
 import gnu.lists.LList;
+import gnu.mapping.Environment;
 import kawa.standard.load;
 
 public class GeiserLoadFile {
 
     public static String loadFile(String filepath) {
         return GeiserEval.evalForm(
-                Language.getDefaultLanguage().getEnvironment(),
+                Environment.user(),
                 LList.list2(load.load, filepath));
     }
 }
diff --git a/src/main/java/kawageiser/GeiserMacroexpand.java 
b/src/main/java/kawageiser/GeiserMacroexpand.java
index e0295b8..8a79139 100644
--- a/src/main/java/kawageiser/GeiserMacroexpand.java
+++ b/src/main/java/kawageiser/GeiserMacroexpand.java
@@ -5,7 +5,6 @@
 
 package kawageiser;
 
-import gnu.expr.Language;
 import gnu.kawa.functions.Format;
 import gnu.kawa.slib.syntaxutils;
 import gnu.mapping.Environment;
@@ -19,7 +18,7 @@ public class GeiserMacroexpand {
     public static String expand(Object form, boolean all) throws Throwable {
         // `all' is ignored: geiser passes #t or #f depending on whether it 
needs
         // expand-1 or expand-all, but Kawa's `expand' can only expand the 
whole tree.
-        return expand(form, Language.getDefaultLanguage().getEnvironment());
+        return expand(form, Environment.user());
     }
 
     public static String expand(Object form, Environment env) throws Throwable 
{