Fix Windows build as fallout from 2012-11-03T18:54:17Z!eggert@cs.ucla.edu.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 62a3eef..bc37c11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
+2012-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/fpending.$(O) and
+       $(BLD)/close-stream.$(O).
+       ($(BLD)/close-stream.$(O)):
+       ($(BLD)/fpending.$(O)): New dependencies.
+
+       * config.bat: Copy lib/execinfo.in.h to lib/execinfo.in-h if needed.
+
+2012-11-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix data-loss with --batch (Bug#9574).
+       * lib/close-stream.c, lib/close-stream.h, lib/fpending.c
+       * lib/fpending.h, m4/close-stream.m4, m4/fpending.m4:
+       New files, from gnulib.
+       * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
+2012-11-02  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (EMACS_ICON): New variable.
+       (install-etc): Use EMACS_ICON to allow choice of icon.
+
 2012-10-26  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (EMACS_NAME): New variable.
+       (EMACS, install-etc, uninstall): Use $EMACS_NAME.
+
+       * Makefile.in (EMACS, EMACSFULL): Transformations should not be
+       applied to $EXEEXT.
+
        * Makefile.in (uninstall): Don't abort if some directories are missing.
        Apply transformation rules to manual pages, desktop and icon files.
        No more emacs22 icons to uninstall.