From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 20 Feb 2011 19:31:01 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~779^2~1^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2763cfc26857991fc4ccde9ff837c06032ac1008;p=emacs.git

Merge from mainline.
---

2763cfc26857991fc4ccde9ff837c06032ac1008
diff --cc ChangeLog
index 10ee8f70394,07cafd1f33a..1155a1b6e8c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,8 +1,23 @@@
+ 2011-02-20  Christoph Scholtes <cschol2112@gmail.com>
+ 
+ 	* lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
+ 	src/makefile.w32-in.
+ 
 +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  Paul Eggert  <eggert@cs.ucla.edu>
  
  	Import crypto/md5 and stdint modules from gnulib.
diff --cc src/ChangeLog
index 880fb10e85a,c53e5add3fb..8bf59d12465
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,14 +1,24 @@@
+ 2011-02-20  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* makefile.w32-in ($(BLD)/fns.$(O)): Depend on
+ 	$(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
+ 
+ 2011-02-20  Christoph Scholtes <cschol2112@gmail.com>
+ 
+ 	* makefile.w32-in: Remove md5.$(O).
+ 	($(BLD)/md5.$(O)): Remove prerequisites, moved to
+ 	lib/makefile.w32-in.
+ 
 +2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Import filemode module from gnulib.
 +	* Makefile.in (base_obj): Remove filemode.o, as it's now in ../lib.
 +	* deps.mk (dired.o): Depend on ../lib/filemode.h, too.
 +	(filemode.o): Remove; this is now in ../lib.
 +	* dired.c: Include <filemode.h>.
 +	(filemodestring): Remove now-redundant decl.
 +	* config.in: Regenerate.
 +
  2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
  
  	Import crypto/md5 and stdint modules from gnulib.