--- gforth/debugs.fs	2009/12/31 15:32:35	1.22
+++ gforth/debugs.fs	2012/12/31 15:25:18	1.26
@@ -1,6 +1,6 @@
 \ Simple debugging aids
 
-\ Copyright (C) 1995,1997,1999,2002,2003,2004,2005,2006,2007,2009 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1997,1999,2002,2003,2004,2005,2006,2007,2009,2011,2012 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -49,13 +49,23 @@ defer .debugline ( nfile nline -- ) \ gf
     printdebugdata
     cr ;
 
+[IFUNDEF] debug-fid
 stderr value debug-fid ( -- fid )
 \G (value) Debugging output prints to this file
+[THEN]
 
 ' (.debugline) IS .debugline
 
 : .debugline-directed ( nfile nline -- )
-    ['] .debugline debug-fid outfile-execute ;
+    action-of type action-of emit { oldtype oldemit }
+    try
+	['] (type) is type ['] (emit) is emit
+	['] .debugline debug-fid outfile-execute
+	0
+    restore
+	oldemit is emit oldtype is type
+    endtry
+    throw ;
 
 :noname ( -- )
     current-sourcepos .debugline-directed ;