--- gforth/savesys.fs	1998/12/08 22:02:50	1.2
+++ gforth/savesys.fs	2006/12/31 13:39:13	1.8
@@ -1,6 +1,6 @@
 \ image dump                                           15nov94py
 
-\ Copyright (C) 1995,1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,2003,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,9 +16,9 @@
 
 \ 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
-: save-string-dict { addr1 u -- addr2 u }
+: save-mem-dict { addr1 u -- addr2 u }
     here { addr2 }
     u allot
     addr1 addr2 u move
@@ -33,7 +33,7 @@
     old-addr new-addr old-cnt 2* cells move
     cnt old-cnt
     U+DO
-        addr i 2* cells + 2@ save-string-dict
+        addr i 2* cells + 2@ save-mem-dict
 	new-addr i 2* cells + 2!
     LOOP
     maxalign ;
@@ -41,11 +41,12 @@
 : dump-fi ( addr u -- )
     w/o bin create-file throw >r
     update-image-included-files
+    update-image-order
     here forthstart - forthstart 2 cells + !
     forthstart
     begin \ search for start of file ("#! " at a multiple of 8)
 	8 -
-	dup 3 s" #! " compare 0=
+	dup 3 s" #! " str=
     until ( imagestart )
     here over - r@ write-file throw
     r> close-file throw ;