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

Merge from mainline.
---

3870e8f9b973b1b9dd220c05345de7ed9dd7ff20
diff --cc lib-src/ChangeLog
index 53983a9decc,ad8ffa8b754..042982aecbf
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@@ -1,19 -1,8 +1,24 @@@
 +2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* 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  Ben Key  <bkey76@gmail.com>  (tiny change)
+ 
+ 	* make-docfile.c (scan_c_file): Adapt DEFVAR_PER_BUFFER case to
+ 	the new BVAR macro.
+ 
  2011-02-20  Juanma Barranquero  <lekktu@gmail.com>
  
  	* makefile.w32-in (obj): Remove md5.o.