--- gforth/backtrac.fs	2004/11/28 20:35:06	1.10
+++ gforth/backtrac.fs	2012/06/23 20:58:30	1.18
@@ -1,12 +1,12 @@
 \ backtrace handling
 
-\ Copyright (C) 1999,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1999,2000,2003,2004,2006,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 
 \ growing buffers that need not be full
@@ -66,16 +65,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 -- )
@@ -101,7 +96,7 @@ IS store-backtrace
 
 : print-backtrace ( addr1 addr2 -- )
     \G print a backtrace for the return stack addr1..addr2
-    cr ." Backtrace:"
+    2dup u< IF  cr ." Backtrace:"  THEN
     swap u+do
 	cr
 	i @ dup hex. ( return-addr? )
@@ -112,6 +107,8 @@ IS store-backtrace
     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