From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 Apr 2012 01:12:46 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~357
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f7752e67381d84cf8c76227b4112d72122b86d98;p=emacs.git

Merge from trunk.
---

f7752e67381d84cf8c76227b4112d72122b86d98
diff --cc lib-src/ChangeLog
index 99df8d949d5,ea5f5a26627..55e76c0b008
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@@ -1,11 -1,12 +1,18 @@@
- 2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
++2012-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	configure: new option --enable-gcc-warnings (Bug#11207)
 +	* Makefile.in (C_WARNINGS_SWITCH): Remove.
 +	(WARN_CFLAGS, WERROR_CFLAGS): New macros.
 +	(BASE_CFLAGS): Use new macros rather than old.
 +
+ 2012-04-16  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	Assume less-ancient POSIX support.
+ 	* update-game-score.c: Include <getopt.h> rather than rolling our
+ 	own decls for optarg, optind, opterr.  See
+ 	<http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html>.
+ 
  2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
 -
  	* emacsclient.c (decode_options) [WINDOWSNT]:
  	Call ttyname instead of passing its address (typo in 2011-12-04T17:13:01Z!lekktu@gmail.com).