diff --git a/ChangeLog b/ChangeLog
index ba159fc1c2..6d57f74373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+Wed Mar 19 23:05:30 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+	* lib/tracer.rb (trace_func): save and recover Thread.critical state.
+	  Fixed by Fukumoto Atsushi <fukumoto@imasy.or.jp> [ruby-dev:19830]
+
 Sun Mar 16 12:29:55 2003  Tanaka Akira  <akr@m17n.org>
 
-        * lib/pp.rb (object_address_group): use to_s instead of name
-          to get name of class.
+	* lib/pp.rb (object_address_group): use to_s instead of name
+	  to get name of class.
 
 Wed Mar 12 16:48:19 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
diff --git a/lib/tracer.rb b/lib/tracer.rb
index f522a9178d..3ccf1b5017 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -119,6 +119,7 @@ class Tracer
       return unless p.call event, file, line, id, binding, klass
     end
     
+    saved_crit = Thread.critical
     Thread.critical = true
     stdout.printf("#%d:%s:%d:%s:%s: %s",
       get_thread_no,
@@ -127,7 +128,7 @@ class Tracer
       klass || '',
       EVENT_SYMBOL[event],
       get_line(file, line))
-    Thread.critical = false
+    Thread.critical = saved_crit
   end
 
   Single = new