From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 8 Jun 2005 19:41:19 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~9192
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=72f23b85ef2b057446b92375d176ff503932a60b;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3363bf4138..82055d3e613 100644
--- 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>