Fix interactor-busy? handling

diff --git a/TODO.txt b/TODO.txt
index 6c0e9b85c0e0e2ab5c6ebe1bc68070af5ad64886..1252cf948d3c247bafd9e2038e4c8175b99c7ba6 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -27,7 +27,7 @@
 - inspector where slot values can be changed
 - compiled call traces:
   - should be independent of whenever the runtime was built with
-    -fomit-frame-pointer or not (ppc and amd64)
+    -fomit-frame-pointer on ppc
   - we don't know if signal handlers run with the same stack or not
 - use crc32 instead of modification date in reload-modules
 - models: don't do redundant work

diff --git a/core/ui/text/interactor.factor b/core/ui/text/interactor.factor
index 27b537adcbbaf4eb624cfe1d025d955b6a064c13..bd3393ce375ed6552c8908b67383fb0c34f35c94 100644 (file)
--- a/core/ui/text/interactor.factor
+++ b/core/ui/text/interactor.factor
@@ -32,12 +32,16 @@ M: interactor graft*
 : add-interactor-history ( str interactor -- )
     over empty? [ 2drop ] [ interactor-history push-new ] if ;
 
+: interactor-continue ( obj interactor -- )
+    t over set-interactor-busy?
+    interactor-continuation schedule-thread-with ;
+
 : interactor-finish ( obj interactor -- )
     [ editor-string ] keep
     [ interactor-input. ] 2keep
     [ add-interactor-history ] keep
     dup control-model clear-doc
-    interactor-continuation continue-with ;
+    interactor-continue ;
 
 : interactor-eval ( interactor -- )
     [
@@ -61,8 +65,7 @@ M: interactor stream-readln
     ] interactor-yield ;
 
 : interactor-call ( quot interactor -- )
-    2dup interactor-input.
-    interactor-continuation schedule-thread-with ;
+    2dup interactor-input. interactor-continue ;
 
 M: interactor stream-read
     swap dup zero?