From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 12 Jun 2005 11:28:55 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~9024
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1e8cad6ea6d8281cdbf7b70d20f5241329da14c;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fd8b519dd4..40127c8510a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH): Don't
+	use an old loaddefs.el, as in Makefile.in.
+
 2005-06-12  Lute Kamstra  <lute@gnu.org>
 
 	* Makefile.in (bootstrap-prepare): Don't use an old loaddefs.el.
diff --git a/src/ChangeLog b/src/ChangeLog
index 5b71d4b089f..a2c70f13109 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32fns.c (w32_abort): Use the MB_YESNO dialog instead of
+	MB_ABORTRETRYIGNORE.  Never return, even if DebugBreak does.
+
 2005-06-11  Eli Zaretskii  <eliz@gnu.org>
 
 	* image.c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg