--- gforth/backtrac.fs	2003/03/09 15:16:46	1.8
+++ gforth/backtrac.fs	2006/12/31 13:39:11	1.15
@@ -1,6 +1,6 @@
 \ backtrace handling
 
-\ Copyright (C) 1999,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1999,2000,2003,2004,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -43,7 +43,8 @@ end-struct buffer%
 
 \ backtrace stuff
 
-create backtrace-rs-buffer buffer% %allot \ copy of the return stack at throw
+create backtrace-rs-buffer buffer% %allot drop
+\ copy of the return stack at throw
 
 : init-backtrace ( -- )
     backtrace-rs-buffer init-buffer ;
@@ -65,16 +66,12 @@ IS 'cold
     else \ throw by signal handler with insufficient information
 	handler @ cell - \ beyond that we know nothing
     then
-    backtrace-rp0 @ [ 2 cells ]L - over - 0 max ;
+    backtrace-rp0 @ [ 1 cells ]L - over - 0 max ;
 
 :noname ( -- )
-    backtrace-empty @
-    if
-	backtrace-return-stack
-	dup backtrace-rs-buffer adjust-buffer
-	backtrace-rs-buffer buffer-address @ swap move
-	backtrace-empty off
-    then ;
+    backtrace-return-stack
+    dup backtrace-rs-buffer adjust-buffer
+    backtrace-rs-buffer buffer-address @ swap move ;
 IS store-backtrace
 
 : print-bt-entry ( return-stack-item -- )
@@ -110,3 +107,9 @@ IS store-backtrace
 :noname ( -- )
     backtrace-rs-buffer 2@ over + print-backtrace ;
 IS dobacktrace
+
+[ifdef] defer-default
+:noname
+    r@ >stderr cr ." deferred word " print-bt-entry ." is uninitialized" ;
+is defer-default
+[then]
\ No newline at end of file