Merge from mainline.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b390cfb..cfd77b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/min-max.h: New file, for "min" and "max".
+
+2011-02-21  Christoph Scholtes  <cschol2112@gmail.com>
+
+       * lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on
+       $(EMACS_ROOT)/nt/inc/stdint.h.
+
+2011-02-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
+       src/makefile.w32-in and adapt.  Depend on stamp_BLD.
+       (GNULIBOBJS): Add $(BLD)/filemode.$(O).
+
+2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Import filemode module from gnulib.
+       * .bzrignore: Add lib/sys/.
+       * Makefile.in (GNULIB_MODULES): Add filemode.
+       * lib/Makefile.am (MOSTLYCLEANDIRS): New macro.
+       * lib/filemode.c: Renamed from src/filemode.c and regenerated
+       from gnulib.  This adds support for some more file types, e.g.,
+       Cray DMF migrated files.
+       * lisp/emacs-lisp/find-gc.el (find-gc-source-files): Remove filemode.c.
+       * lib/filemode.h, lib/sys_stat.in.h, m4/filemode.m4, m4/st_dm_mode.m4:
+       * m4/sys_stat_h.m4: New files, generated from gnulib.
+       * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
+       Regenerate.
+
+2011-02-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * lib/makefile.w32-in ($(BLD)/md5.$(O)): Don't depend on
+       $(EMACS_ROOT)/nt/inc/sys/stat.h.
+
 2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.in (C_WARNINGS_SWITCH): Do not prepend -Wno-pointer-sign.