From 2bb6d7f6b14b00db31e529bef89c2df9c9cbefbd Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 15 Jan 2009 15:50:48 -0600
Subject: [PATCH] Rename editor-caret* and editor-mark* without the * since we
don't have the old accessors anymore
---
basis/ui/gadgets/editors/editors-docs.factor | 10 +++++-----
basis/ui/tools/listener/listener-tests.factor | 2 +-
basis/ui/tools/listener/listener.factor | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/basis/ui/gadgets/editors/editors-docs.factor b/basis/ui/gadgets/editors/editors-docs.factor
index 0522a6a522..66166fec6a 100644
--- a/basis/ui/gadgets/editors/editors-docs.factor
+++ b/basis/ui/gadgets/editors/editors-docs.factor
@@ -20,13 +20,13 @@ HELP: <editor>
{ $values { "editor" "a new " { $link editor } } }
{ $description "Creates a new " { $link editor } " with an empty document." } ;
-{ editor-caret* editor-mark* } related-words
+{ editor-caret editor-mark } related-words
-HELP: editor-caret*
+HELP: editor-caret
{ $values { "editor" editor } { "loc" "a pair of integers" } }
{ $description "Outputs the current caret location as a line/column number pair." } ;
-HELP: editor-mark*
+HELP: editor-mark
{ $values { "editor" editor } { "loc" "a pair of integers" } }
{ $description "Outputs the current mark location as a line/column number pair." } ;
@@ -66,8 +66,8 @@ HELP: set-editor-string
ARTICLE: "gadgets-editors-selection" "The caret and mark"
"If there is no selection, the caret and the mark are at the same location; otherwise the mark delimits the end-point of the selection opposite the caret."
-{ $subsection editor-caret* }
-{ $subsection editor-mark* }
+{ $subsection editor-caret }
+{ $subsection editor-mark }
{ $subsection change-caret }
{ $subsection change-caret&mark }
{ $subsection mark>caret }
diff --git a/basis/ui/tools/listener/listener-tests.factor b/basis/ui/tools/listener/listener-tests.factor
index 5e7d8a395a..9cf0160a50 100644
--- a/basis/ui/tools/listener/listener-tests.factor
+++ b/basis/ui/tools/listener/listener-tests.factor
@@ -115,7 +115,7 @@ IN: ui.tools.listener.tests
[ t ] [
"i" get model>> doc-end
- "i" get editor-caret* =
+ "i" get editor-caret =
] unit-test
! Race condition discovered by SimonRC
diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index e41070f12b..799dddd9de 100644
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -57,7 +57,7 @@ completion-popup ;
[ { 0 0 } ] 2dip doc-range ;
: vocab-completion? ( interactor -- ? )
- [ editor-caret* ] [ model>> ] bi up-to-caret " \r\n" split
+ [ editor-caret ] [ model>> ] bi up-to-caret " \r\n" split
{ [ complete-IN:/USE:? ] [ complete-USING:? ] } 1|| ;
: <word-model> ( interactor -- model )
@@ -467,7 +467,7 @@ M: completion-popup hide-glass-hook
find-world hide-glass ;
: completion-loc/doc ( popup -- loc doc )
- interactor>> [ editor-caret* ] [ model>> ] bi ;
+ interactor>> [ editor-caret ] [ model>> ] bi ;
: accept-completion ( item table -- )
find-completion-popup
@@ -503,7 +503,7 @@ CONSTANT: completion-popup-offset { -4 0 }
: (completion-popup-loc) ( interactor element -- loc )
[ drop screen-loc ] [
- [ [ [ editor-caret* ] [ model>> ] bi ] dip prev-elt ] [ drop ] 2bi
+ [ [ [ editor-caret ] [ model>> ] bi ] dip prev-elt ] [ drop ] 2bi
loc>point
] 2bi v+ completion-popup-offset v+ ;