From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 21 Feb 2011 23:46:32 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~774
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9441f0e4fca691e4d2a2c7842373de8f29414b17;p=emacs.git

Merge from mainline.
---

9441f0e4fca691e4d2a2c7842373de8f29414b17
diff --cc ChangeLog
index ef876b6e831,13e3657bac3..cfd77b652b4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,14 +1,18 @@@
 +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.
diff --cc lib-src/ChangeLog
index 81c6e6fe9b4,01352adf4e3..958539cc044
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@@ -1,30 -1,9 +1,36 @@@
 +2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	New file "lib/min-max.h".
 +	* ebrowse.c (min, max): Define them by including <min-max.h>
 +	instead of defining it ourselves.
 +	* pop.c (min): Likewise.
 +
 +	* movemail.c (popmail): Report fchown failure instead of ignoring it.
 +	But if the file already has the right ownership, don't worry about it.
 +
 +	* make-docfile.c (input_buffer): Rename variables to avoid shadowing.
 +	* test-distrib.c (buf): Make this local, to avoid shadowing.
 +
 +	* movemail.c (main, pop_retr): Rename locals to avoid shadowing.
 +	(progname, sfi, sfo, ibuffer, obuffer): Remove unused vars.
 +	(DIRECTORY_SEP, IS_DIRECTORY_SEP, DONE, IS_FROM_LINE):
 +	Remove unused macros.
 +	* pop.c (index): Remove unused macro.
 +	(KPOP_PORT): Define only if KERBEROS is defined.
 +
 +	Declare file-scope functions and variables static if not exported.
 +	This is more consistent, and is nicer with gcc -Wstrict-prototypes.
 +	* ebrowse.c, emacsclient.c, fakemail.c, make-docfile.c, movemail.c:
 +	* profile.c, test-distrib.c, update-game-score.c:
 +	Declare non-'main' functions and variables to be static.
 +	* ebrowse.c: Omit redundant function prototypes.
 +
+ 2011-02-21  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O))
+ 	($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)):
+ 	Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h.
+ 
  2011-02-21  Ben Key  <bkey76@gmail.com>  (tiny change)
  
  	* make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to