--- gforth/blocks.fs	2003/01/22 10:59:54	1.40
+++ gforth/blocks.fs	2007/02/19 00:08:20	1.50
@@ -1,6 +1,6 @@
 \ A less simple implementation of the blocks wordset. 
 
-\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -64,7 +64,10 @@ User block-offset ( -- addr ) \ gforth
     buffer-struct buffers * %alloc dup block-buffers ! ( addr )
     buffer-struct %size buffers * erase ;
 
-' block-cold INIT8 chained
+:noname ( -- )
+    defers 'cold
+    block-cold
+; is 'cold
 
 block-cold
 
@@ -76,10 +79,10 @@ Defer flush-blocks ( -- ) \ gforth
 	2dup open-fpath-file throw
 	rot close-file throw  2dup file-status throw bin open-file throw
 	>r 2drop r>
-    recover ( c-addr u ior )
+    endtry-iferror ( c-addr u ior )
 	>r 2dup file-status nip 0= r> and throw \ does it really not exist?
 	r/w bin create-file throw
-    endtry
+    then
     block-fid @ IF
 	flush-blocks block-fid @ close-file throw
     THEN
@@ -112,7 +115,7 @@ Defer flush-blocks ( -- ) \ gforth
 
 : save-buffer ( buffer -- ) \ gforth
     >r
-    r@ buffer-dirty @ r@ buffer-block @ 0<> and
+    r@ buffer-dirty @
     if
 	r@ buffer-block @ block-position
 	r@ block-buffer chars/block  r@ buffer-fid @  write-file throw
@@ -216,7 +219,7 @@ User scr ( -- a-addr ) \ block-ext s-c-r
                               \ restore-input
 :noname  blk @ >in @ 2 ;      \ save-input
 :noname  2 ;                  \ source-id "*a block*"
-:noname  1 blk +! 1 loadline +! true ;      \ refill
+:noname  1 blk +! 1 loadline +! >in off true ;      \ refill
 :noname  blk @ block chars/block ;  \ source
 
 Create block-input   A, A, A, A, A,