From a98d59d93c47a5bfff22cec5f62a82b65d9ea166 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 28 Jan 2009 17:27:42 -0600
Subject: [PATCH] Update ui.tools.listener docs

---
 .../listener/completion/completion.factor      |  2 +-
 basis/ui/tools/listener/listener-docs.factor   | 18 +++++-------------
 basis/ui/tools/listener/listener.factor        |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/basis/ui/tools/listener/completion/completion.factor b/basis/ui/tools/listener/completion/completion.factor
index 5287416aeb..1ef874aa1d 100644
--- a/basis/ui/tools/listener/completion/completion.factor
+++ b/basis/ui/tools/listener/completion/completion.factor
@@ -133,7 +133,7 @@ CONSTANT: completion-popup-offset { -4 0 }
     [ [ 2drop find-world ] [ 2nip ] [ completion-popup-loc ] 3tri ] 3bi
     show-glass ;
 
-: word-completion-popup ( interactor -- )
+: code-completion-popup ( interactor -- )
     dup vocab-completion?
     [ vocabs-matching ] [ words-matching ] ? '[ [ { } ] _ if-empty ]
     one-word-elt show-completion-popup ;
diff --git a/basis/ui/tools/listener/listener-docs.factor b/basis/ui/tools/listener/listener-docs.factor
index 97ed13f663..d3c31d9cfc 100644
--- a/basis/ui/tools/listener/listener-docs.factor
+++ b/basis/ui/tools/listener/listener-docs.factor
@@ -9,26 +9,18 @@ $nl
 $nl
 "Interactors implement the " { $link stream-readln } ", " { $link stream-read } " and " { $link read-quot } " generic words." } ;
 
-ARTICLE: "ui-listener-completion" "Word and vocabulary completion"
-"The listener is great"
-;
-
 ARTICLE: "ui-listener" "UI listener"
-"The graphical listener is based around the terminal listener (" { $link "listener" } ") and adds the following features:"
-{ $list
-    "Input history"
-    { "Completion (see " { $link "ui-listener-completion" } ")" }
-    { "Clickable presentations (see " { $link "ui-presentations" } ")" }
-}
+"The graphical listener is based around the terminal listener (" { $link "listener" } ") and adds an input history, and word and vocabulary completion."
 { $command-map listener-gadget "toolbar" }
-{ $command-map listener-gadget "scrolling" }
-{ $command-map listener-gadget "multi-touch" }
+{ $command-map interactor "completion" }
 { $command-map interactor "interactor" }
 { $command-map source-editor "word" }
 { $command-map interactor "quotation" }
+{ $command-map listener-gadget "scrolling" }
+{ $command-map listener-gadget "multi-touch" }
 { $heading "Editing commands" }
 "The text editing commands are standard; see " { $link "gadgets-editors" } "."
 { $heading "Implementation" }
-"Listeners are instances of " { $link listener-gadget } ". The listener consists of an output area (instance of " { $link pane } ") and an input area (instance of " { $link interactor } ")." ;
+"Listeners are instances of " { $link listener-gadget } ". The listener consists of an output area (instance of " { $link pane } ") and an input area (instance of " { $link interactor } "). Clickable presentations can also be printed to the listener; see " { $link "ui-presentations" } "." ;
 
 ABOUT: "ui-listener"
\ No newline at end of file
diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index 716732cec3..10cc214870 100644
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -340,7 +340,7 @@ interactor "interactor" f {
 } define-command-map
 
 interactor "completion" f {
-    { T{ key-down f f "TAB" } word-completion-popup }
+    { T{ key-down f f "TAB" } code-completion-popup }
     { T{ key-down f { C+ } "p" } recall-previous }
     { T{ key-down f { C+ } "n" } recall-next }
     { T{ key-down f { C+ } "r" } history-completion-popup }