From 268fde7d565583c99352870c27e0ed854a1098e6 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Sun, 18 Dec 2005 00:03:11 +0000
Subject: [PATCH] forgot to fix help system for stack effect change

---
 library/help/help.factor   | 6 +++---
 library/test/tuple.factor  | 5 +++--
 library/test/words.factor  | 8 ++++----
 library/ui/commands.factor | 2 +-
 library/ui/listener.factor | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/library/help/help.factor b/library/help/help.factor
index 69f2e7209c..2852af57ee 100644
--- a/library/help/help.factor
+++ b/library/help/help.factor
@@ -10,9 +10,9 @@ namespaces parser sequences words ;
 
 : glossary ( name -- ) <term> help ;
 
-[ word? ] "Show word documentation" [ help ] define-command
-[ term? ] "Show term definition" [ help ] define-command
-[ link? ] "Show article" [ help ] define-command
+"Show word documentation" [ word? ] [ help ] define-command
+"Show term definition" [ term? ] [ help ] define-command
+"Show article" [ link? ] [ help ] define-command
 
 H{ } clone articles global set-hash
 H{ } clone terms global set-hash
diff --git a/library/test/tuple.factor b/library/test/tuple.factor
index 9d045fda9c..311198490d 100644
--- a/library/test/tuple.factor
+++ b/library/test/tuple.factor
@@ -1,5 +1,5 @@
 USING: errors generic kernel kernel-internals math parser
-sequences test words ;
+sequences test words hashtables ;
 IN: temporary
 
 TUPLE: rect x y w h ;
@@ -101,7 +101,8 @@ TUPLE: delegate-clone ;
 [ "temporary-1" ]
 [
     "IN: temporary-1 SYMBOL: foobar IN: temporary TUPLE: foobar ;" eval
-    "foobar" [ "temporary-1" "temporary" ] search word-vocabulary
+    "foobar" { "temporary" "temporary-1" } [ vocab ] map
+    hash-stack word-vocabulary
 ] unit-test
 
 TUPLE: size-test a b c d ;
diff --git a/library/test/words.factor b/library/test/words.factor
index 49d0ce8860..e4fdfa0827 100644
--- a/library/test/words.factor
+++ b/library/test/words.factor
@@ -4,7 +4,7 @@ sequences test words ;
 
 [ 4 ] [
     "poo" "scratchpad" create [ 2 2 + ] define-compound
-    "poo" [ "scratchpad" ] search execute
+    "poo" "scratchpad" lookup execute
 ] unit-test
 
 [ t ] [ t vocabs [ words [ word? and ] each ] each ] unit-test
@@ -25,17 +25,17 @@ DEFER: plist-test
 
 "create-test" "scratchpad" create { 1 2 } "testing" set-word-prop
 [ { 1 2 } ] [
-    "create-test" [ "scratchpad" ] search "testing" word-prop
+    "create-test" "scratchpad" lookup "testing" word-prop
 ] unit-test
 
 [
-    [ t ] [ \ car "car" [ "lists" ] search = ] unit-test
+    [ t ] [ \ car "car" "lists" lookup = ] unit-test
 
     "test-scope" "scratchpad" create drop
 ] with-scope
 
 [ "test-scope" ] [
-    "test-scope" [ "scratchpad" ] search word-name
+    "test-scope" "scratchpad" lookup word-name
 ] unit-test
 
 [ t ] [ vocabs array? ] unit-test
diff --git a/library/ui/commands.factor b/library/ui/commands.factor
index 6e59d9183f..57c8a70005 100644
--- a/library/ui/commands.factor
+++ b/library/ui/commands.factor
@@ -25,7 +25,7 @@ V{ } clone commands global set-hash
     commands get [ command-pred call ] subset-with ;
 
 : command>quot ( presented command -- quot )
-    command-quot curry [ pane get pane-call ] cons ;
+    command-quot curry [ pane get pane-call ] curry ;
 
 TUPLE: command-button object ;
 
diff --git a/library/ui/listener.factor b/library/ui/listener.factor
index b11a577945..8c844f673c 100644
--- a/library/ui/listener.factor
+++ b/library/ui/listener.factor
@@ -39,7 +39,7 @@ C: display ( -- display )
     callstack-hook get call callstack-display get present-stack ;
 
 : usable-words ( -- words )
-    use get hash-concat hash-keys ;
+    use get hash-concat hash-values ;
 
 : word-completion ( -- )
     usable-words [ word-name ] map