From 94506de202aad47d407bbbee71981694c0bc957e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Thu, 23 Dec 2004 21:58:33 +0000
Subject: [PATCH] inference workaround

---
 factor/jedit/FactorPlugin.java       | 3 ++-
 library/bootstrap/init-stage2.factor | 5 ++---
 library/inference/branches.factor    | 2 +-
 library/inference/words.factor       | 2 +-
 library/test/inspector.factor        | 9 ---------
 library/test/test.factor             | 1 -
 6 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 library/test/inspector.factor

diff --git a/factor/jedit/FactorPlugin.java b/factor/jedit/FactorPlugin.java
index f3c4d693ac..4ad20a438c 100644
--- a/factor/jedit/FactorPlugin.java
+++ b/factor/jedit/FactorPlugin.java
@@ -99,10 +99,11 @@ public class FactorPlugin extends EditPlugin
 			{
 				String[] args = jEdit.getProperty("factor.external.args","-jedit")
 					.split(" ");
-				String[] nargs = new String[args.length + 3];
+				String[] nargs = new String[args.length + 4];
 				nargs[0] = jEdit.getProperty("factor.external.program");
 				nargs[1] = jEdit.getProperty("factor.external.image");
 				nargs[2] = "-no-ansi";
+				nargs[3] = "-no-smart-terminal";
 				System.arraycopy(args,0,nargs,3,args.length);
 				p = Runtime.getRuntime().exec(nargs);
 				p.getErrorStream().close();
diff --git a/library/bootstrap/init-stage2.factor b/library/bootstrap/init-stage2.factor
index 5e77df53fb..7a9cf4b3c1 100644
--- a/library/bootstrap/init-stage2.factor
+++ b/library/bootstrap/init-stage2.factor
@@ -26,7 +26,6 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: kernel
-USE: ansi
 USE: alien
 USE: compiler
 USE: errors
@@ -92,8 +91,8 @@ init-error-handler
 
 0 [ drop succ ] each-word unparse write " words" print 
 
-! "Counting word usages..." print
-! tally-usages
+"Counting word usages..." print
+tally-usages
 ! 
 ! "Automatically inlining words called " write
 ! auto-inline-count unparse write
diff --git a/library/inference/branches.factor b/library/inference/branches.factor
index 98dde2453d..3fa127a4da 100644
--- a/library/inference/branches.factor
+++ b/library/inference/branches.factor
@@ -108,7 +108,7 @@ USE: hashtables
         save-effect set
         dup value-recursion recursive-state set
         copy-interpreter
-        d-in [ vector-clone ] change
+        d-in [ [ vector-clone ] vector-map ] change
         dataflow-graph off
         literal-value infer-quot
         #values values-node
diff --git a/library/inference/words.factor b/library/inference/words.factor
index f5970a0c6c..3764539ec1 100644
--- a/library/inference/words.factor
+++ b/library/inference/words.factor
@@ -184,7 +184,7 @@ USE: prettyprint
         check-recursion recursive-word
     ] [
         drop dup "infer-effect" word-property dup [
-            apply-effect
+            dup cdr cons? [ old-effect ] when apply-effect
         ] [
             drop
             [
diff --git a/library/test/inspector.factor b/library/test/inspector.factor
deleted file mode 100644
index 256538ba33..0000000000
--- a/library/test/inspector.factor
+++ /dev/null
@@ -1,9 +0,0 @@
-IN: scratchpad
-USE: inspector
-USE: namespaces
-USE: words
-
-"httpd" apropos.
-"car" usages.
-global describe
-vocabularies get describe
diff --git a/library/test/test.factor b/library/test/test.factor
index 89e4817eaa..e04efbbfff 100644
--- a/library/test/test.factor
+++ b/library/test/test.factor
@@ -83,7 +83,6 @@ USE: unparser
         "prettyprint"
         "image"
         "init"
-        "inspector"
         "io/io"
         "listener"
         "vectors"