]> gitweb.factorcode.org Git - factor.git/commitdiff
Some minor updates 0.71 factor-0-71-b
authorSlava Pestov <slava@factorcode.org>
Sun, 2 Jan 2005 21:31:43 +0000 (21:31 +0000)
committerSlava Pestov <slava@factorcode.org>
Sun, 2 Jan 2005 21:31:43 +0000 (21:31 +0000)
factor/jedit/FactorPlugin.java
library/tools/listener.factor

index d526b237a5b0fe3386a815f56bc46b0f140e776a..b1b1c583ecfeeb01ab05be73736d0feab241ea13 100644 (file)
@@ -108,17 +108,25 @@ public class FactorPlugin extends EditPlugin
 
                        try
                        {
+                               String exePath = jEdit.getProperty(
+                                       "factor.external.program");
+                               String imagePath = jEdit.getProperty(
+                                       "factor.external.image");
                                List args = new ArrayList();
-                               args.add(jEdit.getProperty("factor.external.program"));
-                               args.add(jEdit.getProperty("factor.external.image"));
+                               args.add(exePath);
+                               args.add(imagePath);
                                args.add("-shell=telnet");
                                args.add("-telnetd-port=" + PORT);
                                String[] extraArgs = jEdit.getProperty(
                                        "factor.external.args")
                                        .split(" ");
                                addNonEmpty(extraArgs,args);
-                               process = Runtime.getRuntime().exec((String[])args.toArray(
-                                       new String[args.size()]));
+                               process = Runtime.getRuntime().exec(
+                                       (String[])args.toArray(
+                                       new String[args.size()]),
+                                       null,
+                                       new File(MiscUtilities
+                                       .getParentOfPath(imagePath)));
 
                                external = new ExternalFactor(PORT);
                        }
index 625dbc07e5b0eacf440d9f8abdc18c529a3faba9..683f6ffe81f0ca38f5b88b245a7b68d6e181b84f 100644 (file)
@@ -105,9 +105,9 @@ global [
     " (OS: " write os write
     " CPU: " write cpu write
     ")" print
-    "Copyright (C) 2003, 2004 Slava Pestov" print
-    "Copyright (C) 2004 Chris Double" print
-    "Copyright (C) 2004 Mackenzie Straight" print
+    "Copyright (C) 2003, 2005 Slava Pestov" print
+    "Copyright (C) 2004, 2005 Chris Double" print
+    "Copyright (C) 2004, 2005 Mackenzie Straight" print
     "Type ``exit'' to exit, ``help'' for help." print
     terpri
     room.