--- gforth/extend.fs	1997/07/06 15:55:23	1.27
+++ gforth/extend.fs	1998/12/19 13:43:17	1.31
@@ -1,6 +1,6 @@
 \ EXTEND.FS    CORE-EXT Word not fully tested!         12may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -94,20 +94,18 @@ decimal
 
 \ SEARCH                                                02sep94py
 
-: search   ( buf buflen text textlen -- restbuf restlen flag ) \ string
-    2over  2 pick - 1+ 3 pick c@ >r
-    BEGIN
-	r@ scan dup
-    WHILE
-	>r >r  2dup r@ -text
-	0=
-	IF
-	    >r drop 2drop r> r> r> rot + 1- rdrop true
-	    EXIT
-	THEN
-	r> r>  1 /string
-    REPEAT
-    2drop 2drop  rdrop false ;
+: search ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 flag ) \ string
+    \ not very efficient; but if we want efficiency, we'll do it as primitive
+    2>r 2dup
+    begin
+	dup r@ >=
+    while
+	over 2r@ swap -text 0= if
+	    2swap 2drop 2r> 2drop true exit
+	endif
+	1 /string
+    repeat
+    2drop 2r> 2drop false ;
 
 \ SOURCE-ID SAVE-INPUT RESTORE-INPUT                    11jun93jaw
 
@@ -170,29 +168,73 @@ variable span ( -- a-addr ) \ core-ext
 \ Marker creates a mark that is removed (including everything 
 \ defined afterwards) when executing the mark.
 
-: marker, ( -- mark )  here dup A,
-  voclink @ A, voclink
-  BEGIN  @ dup WHILE  dup 0 wordlist-link - @ A,  REPEAT  drop
-  udp @ , ;
+: included-files-mark ( -- u )
+    included-files 2@ nip
+    blk @ 0=
+    if \ not input from blocks
+	source-id 1 -1 within
+	if \ input from file
+	    1- \ do not include the last file (hopefully this is the
+	       \ currently included file)
+	then
+    then ;  
+
+\ hmm, most of the saving appears to be pretty unnecessary: we could
+\ derive the wordlists and the words that have to be kept from the
+\ saved value of dp value. - anton
+
+: marker, ( -- mark )
+    here
+    included-files-mark ,
+    dup A, \ here
+    voclink @ A, \ vocabulary list start
+    \ for all wordlists, remember wordlist-id (the linked list)
+    voclink
+    BEGIN
+	@ dup
+    WHILE
+	dup 0 wordlist-link - wordlist-id @ A,
+    REPEAT
+    drop
+    \ remember udp
+    udp @ , ;
 
 : marker! ( mark -- )
-    dup @ swap cell+
+    \ reset included files count; resize will happen on next add-included-file
+    included-files 2@ drop over @ included-files 2! cell+
+    \ rest of marker!
+    dup @ swap cell+ ( here rest-of-marker )
     dup @ voclink ! cell+
+    \ restore wordlists to former words
     voclink
     BEGIN
 	@ dup 
     WHILE
-	over @ over 0 wordlist-link - !
+	over @ over 0 wordlist-link - wordlist-id !
 	swap cell+ swap
     REPEAT
-    drop  voclink
+    drop
+    \ rehash wordlists to remove forgotten words
+    \ why don't we do this in a single step? - anton
+    voclink
     BEGIN
 	@ dup
     WHILE
 	dup 0 wordlist-link - rehash
     REPEAT
     drop
-    @ udp !  dp ! ;
+    \ restore udp and dp
+    @ udp !  dp !
+    \ clean up vocabulary stack
+    0 vp @ 0
+    ?DO
+	vp cell+ I cells + @ dup here >
+	IF  drop  ELSE  swap 1+  THEN
+    LOOP
+    dup 0= or set-order \ -1 set-order if order is empty
+    get-current here > IF
+	forth-wordlist set-current
+    THEN ;
 
 : marker ( "mark" -- )
     marker, Create A,