*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3363bf413805472f9997e0870c27feaad617c56..82055d3e6138ae7d5ea93154ab7dc30151e79cf5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/debug.el (debug): Don't iconify if we know we'll re-enter
+       the debugger immediately anyway.  Undo the 2005-06-06 change, rendered
+       unnecessary now.
+
 2005-06-08  Richard M. Stallman  <rms@gnu.org>
 
        * emacs-lisp/easy-mmode.el (define-minor-mode): If BODY is empty,
@@ -13,12 +19,7 @@
        (makefile-dependency-regex): Delete spurious `bb'.
 
        * faces.el (escape-glyph): Use blue once again in last case.
-       (no-break-space): Redefined so that it isn't invisible on a tty.
-
-2005-06-07  Richard M. Stallman  <rms@gnu.org>
-
-       * progmodes/make-mode.el (makefile-dependency-regex):
-       Remove `bb' inserted by mistake.
+       (no-break-space): Redefine so that it isn't invisible on a tty.
 
 2005-06-08  Kim F. Storm  <storm@cua.dk>