--- gforth/ds2texi.fs	2003/01/26 20:56:37	1.26
+++ gforth/ds2texi.fs	2005/12/31 15:46:08	1.30
@@ -1,6 +1,6 @@
 \ documentation source to texi format converter
 
-\ Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,1999,2003,2005 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -94,14 +94,14 @@ create description-buffer 4096 chars all
 : make-doc ( -- )
     get-current documentation set-current
     create
-	last @ name>string skip-prefix 2,		\ name
+	latest name>string skip-prefix 2,		\ name
 	[char] ) parse save-mem 2,	\ stack-effect
 	bl sword condition-wordset 2,	\ wordset
 	bl sword dup	\ pronounciation
 	if
 	    condition-pronounciation
 	else
-	    2drop last @ name>string skip-prefix
+	    2drop latest name>string skip-prefix
 	endif
 	2,
 	get-description save-mem 2,
@@ -167,7 +167,7 @@ create description-buffer 4096 chars all
     >r dup >r
     3 pick over str=
     if \ addr2 u2 is a prefix of addr1 u1
-	r> /string documentation search-wordlist
+	r> /string -trailing documentation search-wordlist
 	if \ the rest of addr1 u1 is in documentation
 	    execute r> execute true
 	else