--- gforth/kernel/cond.fs	1999/03/23 20:24:24	1.5
+++ gforth/kernel/cond.fs	2000/06/17 12:01:55	1.8
@@ -48,7 +48,9 @@ variable backedge-locals
 \ locals-list (valid at address) (third)
 
 \ types
-0 constant defstart
+[IFUNDEF] defstart 
+0 constant defstart	\ usally defined in comp.fs
+[THEN]
 1 constant live-orig
 2 constant dead-orig
 3 constant dest \ the loopback branch is always assumed live
@@ -78,13 +80,13 @@ variable backedge-locals
 
 3 constant cs-item-size
 
-: CS-PICK ( ... u -- ... destu ) \ tools-ext
+: CS-PICK ( ... u -- ... destu ) \ tools-ext c-s-pick
  1+ cs-item-size * 1- >r
  r@ pick  r@ pick  r@ pick
  rdrop
  dup non-orig? ;
 
-: CS-ROLL ( destu/origu .. dest0/orig0 u -- .. dest0/orig0 destu/origu ) \ tools-ext
+: CS-ROLL ( destu/origu .. dest0/orig0 u -- .. dest0/orig0 destu/origu ) \ tools-ext c-s-roll
  1+ cs-item-size * 1- >r
  r@ roll r@ roll r@ roll
  rdrop
@@ -161,9 +163,10 @@ Defer again-like ( dest -- addr )
 : AGAIN ( compilation dest -- ; run-time -- ) \ core-ext
     dest? again-like  POSTPONE branch  <resolve ; immediate restrict
 
-Defer until-like
-: until, ( list addr xt1 xt2 -- )  drop compile, <resolve drop ;
-' until, IS until-like
+Defer until-like ( list addr xt1 xt2 -- )
+:noname ( list addr xt1 xt2 -- )
+    drop compile, <resolve drop ;
+IS until-like
 
 : UNTIL ( compilation dest -- ; run-time f -- ) \ core
     dest? ['] ?branch ['] ?branch-lp+!# until-like ; immediate restrict