*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b7c407c292bf504d9c9d191ab6135684c9b9321..febc952f5f26bb4b963d85be6cb5c2d707fd1d8e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-05  Andrew Innes  <andrewi@gnu.org>
+
+       * makefile.nt: Add support for `bootstrap' and related targets.
+
 2000-07-05  Stefan Monnier  <monnier@cs.yale.edu>
 
        * emacs-lisp/easymenu.el (easy-menu-define): Docstring fix.

diff --git a/src/ChangeLog b/src/ChangeLog
index 35d04987a6ee1f7b80f43af671e267a803c23ba4..02b983e454cb8781ad96b3d67b30eab256c44b80 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,33 @@
+2000-07-05  Andrew Innes  <andrewi@gnu.org>
+
+       * vm-limit.c (check_memory_limits) [REL_ALLOC]: Use real_morecore
+       when non-NULL instead of __morecore, to take account of buffer
+       memory.  This also solves a problem with spurious memory warnings
+       on Windows.
+
+       * ralloc.c: Make real_morecore non-static.
+
+       * eval.c (internal_condition_case): Comment out abort if
+       interrupt_input_blocked is not zero.
+
+       * makefile.nt: Add support for `bootstrap' and related targets.
+       Include minimal debug info in emacs.exe in release build.
+       Remove all dependencies on lisp.h, and fixup some others.
+
+       * w32.c (init_environment): Install code from 20.7 for providing
+       default values for environment variables, based on the
+       executable's own location.
+       (map_w32_filename): Handle filenames that are longer than
+       MAX_PATH.
+       (sys_socket): Install socket inheritance bug fix from 20.7.
+
+       * alloca.c [emacs]: Include lisp.h (needed by atimer.h included
+       here via blockinput.h).
+
 2000-07-05  Stefan Monnier  <monnier@cs.yale.edu>
 
-       * w32menu.c (w32_menu_display_help):
-       * xmenu.c (menu_help_callback): Use show_help_echo.
+       * w32menu.c (w32_menu_display_help): * xmenu.c
+       (menu_help_callback): Use show_help_echo.
 
        * keyboard.h (show_help_echo): Declare.
 
@@ -44,11 +70,6 @@
        the order given by Vframe_list.
        (next_window): Reverse the handling of NEXT_P.
 
-2000-07-04  Andrew Innes  <andrewi@gnu.org>
-
-       * alloca.c [emacs]: Include lisp.h (needed by atimer.h included
-       here via blockinput.h).
-
 2000-07-04  Gerd Moellmann  <gerd@gnu.org>
 
        * window.c (Vwindow_list): New variable.