--- gforth/blocks.fs	2007/02/18 18:59:40	1.49
+++ gforth/blocks.fs	2011/01/19 19:00:45	1.56
@@ -1,12 +1,12 @@
 \ A less simple implementation of the blocks wordset. 
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007,2008 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 
 \ A more efficient implementation would use mmap on OSs that
@@ -78,9 +77,8 @@ 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> 0
-    restore endtry
-    ?dup-if ( c-addr u ior )
+	>r 2drop r>
+    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
     then
@@ -126,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
@@ -152,7 +150,7 @@ Defer flush-blocks ( -- ) \ gforth
 : get-buffer ( u -- a-addr ) \ gforth
     0 buffers um/mod drop buffer-struct %size * block-buffers @ + ;
 
-: block ( u -- a-addr ) \ gforthman- block
+: block ( u -- a-addr ) \ block
     \G If a block buffer is assigned for block @i{u}, return its
     \G start address, @i{a-addr}. Otherwise, assign a block buffer
     \G for block @i{u} (if the assigned block buffer has been
@@ -226,9 +224,10 @@ 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.
+\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.
+    dup 0= -35 and throw
     block-input 0 new-tib dup loadline ! blk !  s" * a block*" loadfilename 2!
     ['] interpret catch pop-file throw ;
 [ELSE]
@@ -246,6 +245,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.
+    dup 0= -35 and throw
     s" * a block*" loadfilename>r
     push-file
     dup loadline ! blk ! >in off ['] interpret catch
@@ -293,7 +293,7 @@ Create block-input   A, A, A, A, A,
 \     0= IF  block-included  ELSE  included  THEN ;
 
 get-current environment-wordlist set-current
-true constant block
+true constant block \ environment- environment
 true constant block-ext
 set-current