--- gforth/blocks.fs	2003/01/19 23:35:29	1.37
+++ gforth/blocks.fs	2007/02/18 18:59:40	1.49
@@ -1,6 +1,6 @@
 \ A less simple implementation of the blocks wordset. 
 
-\ Copyright (C) 1995-2003 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
 
@@ -75,11 +78,12 @@ Defer flush-blocks ( -- ) \ gforth
     try ( c-addr u )
 	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 )
+	>r 2drop r> 0
+    restore endtry
+    ?dup-if ( 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 +116,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 +220,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,
@@ -225,7 +229,7 @@ Create block-input   A, A, A, A, A,
     \G Save the current input source specification. Store @i{n} in
     \G @code{BLK}, set @code{>IN} to 0 and interpret. When the parse
     \G area is exhausted, restore the input source specification.
-    block-input 0 new-tib dup loadline ! blk !  2 loadfilename# !
+    block-input 0 new-tib dup loadline ! blk !  s" * a block*" loadfilename 2!
     ['] interpret catch pop-file throw ;
 [ELSE]
 : (source)  ( -- c-addr u )
@@ -242,12 +246,11 @@ Create block-input   A, A, A, A, A,
     \G Save the current input source specification. Store @i{n} in
     \G @code{BLK}, set @code{>IN} to 0 and interpret. When the parse
     \G area is exhausted, restore the input source specification.
-    loadfilename# @ >r
-    2 loadfilename# ! \ "*a block*"
+    s" * a block*" loadfilename>r
     push-file
     dup loadline ! blk ! >in off ['] interpret catch
     pop-file
-    r> loadfilename# !
+    r>loadfilename
     throw ;
 [THEN]