--- gforth/extend.fs	1997/07/31 16:17:09	1.28
+++ gforth/extend.fs	1998/12/08 22:02:41	1.30
@@ -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.
 
@@ -190,7 +190,17 @@ variable span ( -- a-addr ) \ core-ext
 	dup 0 wordlist-link - rehash
     REPEAT
     drop
-    @ udp !  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,