Merge from trunk.

diff --cc lib-src/ChangeLog
index 99df8d949d5689bf17ba8b003475cbe07ebb1b76,ea5f5a2662796092c11873f0c5b723b97ab5394e..55e76c0b0080b00d056a7af6ea2ef0eb90ca5787
--- 1/lib-src/ChangeLog
--- 2/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).
  

diff --cc src/ChangeLog
Simple merge