# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1109471458 0
# Node ID df3d4f029cebbb5391d74088c440cea86a9818d8
# Parent  eeb966123ab7102790c46973398456031460aaf3
*** empty log message ***

diff -r eeb966123ab7 -r df3d4f029ceb lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Feb 27 02:30:24 2005 +0000
+++ b/lisp/ChangeLog	Sun Feb 27 02:30:58 2005 +0000
@@ -1,3 +1,10 @@
+2005-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/trace.el (inhibit-trace): New var.
+	(trace-make-advice): Use it.
+
+	* emacs-lisp/debug.el (debug): Put back the inhibit-trace.
+
 2005-02-26  Kim F. Storm  <storm@cua.dk>
 
 	* mouse.el (mouse-1-click-in-non-selected-windows): New defcustom.