--- gforth/blocks.fs	2007/12/31 18:40:23	1.53
+++ gforth/blocks.fs	2011/12/31 15:29:25	1.59
@@ -1,6 +1,6 @@
 \ A less simple implementation of the blocks wordset. 
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007,2008,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -89,7 +89,7 @@ Defer flush-blocks ( -- ) \ gforth
 
 : use ( "file" -- ) \ gforth
     \g Use @i{file} as the blocks file.
-    name open-blocks ;
+    name name-too-short? open-blocks ;
 
 \ the file is opened as binary file, since it either will contain text
 \ without newlines or binary data
@@ -124,7 +124,7 @@ Defer flush-blocks ( -- ) \ gforth
     rdrop ;
 
 : empty-buffer ( buffer -- ) \ gforth
-    buffer-block off ;
+    dup buffer-block on buffer-dirty off ;
 
 : save-buffers  ( -- ) \ block
     \G Transfer the contents of each @code{update}d block buffer to
@@ -223,10 +223,9 @@ User scr ( -- a-addr ) \ block-ext s-c-r
 
 Create block-input   A, A, A, A, A,
 
-: load  ( i*x n -- j*x ) \ block
-    \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.
+: load  ( i*x u -- j*x ) \ block
+    \g Text-interpret block @i{u}.  Block 0 cannot be @code{load}ed.
+    dup 0= -35 and throw
     block-input 0 new-tib dup loadline ! blk !  s" * a block*" loadfilename 2!
     ['] interpret catch pop-file throw ;
 [ELSE]
@@ -240,10 +239,9 @@ Create block-input   A, A, A, A, A,
 \G @i{c-addr} is the address of the input buffer and @i{u} is the
 \G number of characters in it.
 
-: load ( i*x n -- j*x ) \ block
-    \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.
+: load ( i*x u -- j*x ) \ block
+    \g Text-interpret block @i{u}.  Block 0 cannot be @code{load}ed.
+    dup 0= -35 and throw
     s" * a block*" loadfilename>r
     push-file
     dup loadline ! blk ! >in off ['] interpret catch