Merge from trunk; add Bug#.

diff --cc ChangeLog
index 8f7ccc573afb7b8e6406b0446f99ddf6c20dda6b,a1b9a9ca7df21fa1f027672c18d929011c4e7d18..8d89e361c59644e89a6d7980b89854c9c7052edb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,9 +1,26 @@@
-       configure: new option --enable-gcc-warnings
 +2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
 +
++      configure: new option --enable-gcc-warnings (Bug#11207)
 +      I have been using this change for many months in my private copy
 +      of Emacs, and have used it to find several bugs.  It's mature
 +      enough to publish now.
 +      * Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
 +      * configure.in: Support --enable-gcc-warnings, in the style of
 +      other GNU packages such as coreutils.
 +      (C_WARNINGS_SWITCH): Remove, replacing with...
 +      (WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
 +      (PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
 +      when including system files with GCC.
 +      * etc/NEWS: Mention --enable-gcc-warnings.
 +      * lib/Makefile.am (AM_CFLAGS): New macro.
 +      * m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
 +
+ 2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
+ 
+       * info/dir (File):
+       * Makefile.in: Add emacs-gnutls to the info directory and the
+       INFO_FILES target.
+ 
  2012-04-09  Glenn Morris  <rgm@gnu.org>
  
        * Makefile.in (leim): Check cd return value.  Pass fewer variables.

diff --cc Makefile.in
Simple merge

diff --cc etc/NEWS
index dd302a052d67aa35208662fe54acc41464f1a1e8,a1ef62c0bd63a6c1a2d8fbf66bc72360fb4b7f10..2e11af4c1c38e6946518f8ffc40b738c22354152
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -22,15 -22,13 +22,20 @@@ so we will look at it and add it to th
  
  \f
  * Installation Changes in Emacs 24.2
 +
 +** New configure option '--enable-gcc-warnings', intended for developers.
 +If building with GCC, this enables compile-time checks that warn about
 +possibly-questionable C code.  On a recent GNU system there should be
 +no warnings; on older and on non-GNU systems the generated warnings
 +may or may not be useful.  By default, these warnings are not generated.
 +
  \f
  * Startup Changes in Emacs 24.2
+ 
+ ** Emacs no longer searches for `leim-list.el' files beneath the standard
+ lisp/ directory.  There should not be any there anyway.  If you have
+ been adding them there, put them somewhere else, eg site-lisp.
+ 
  \f
  * Changes in Emacs 24.2
  

diff --cc lib-src/ChangeLog
index 86b92b5b84a58613effe6df0f677955fed316edb,aad382de6d069ebaa836cc3f07efb6913851285d..a9ad2a97ea3988f8545616c53d05a86367e1a3d5
--- 1/lib-src/ChangeLog
--- 2/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@@ -1,10 -1,3 +1,10 @@@
-       configure: new option --enable-gcc-warnings
 +2012-04-09  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-07  Eli Zaretskii  <eliz@gnu.org>
  
        * makefile.w32-in (obj): Add xml.o.

diff --cc lwlib/ChangeLog
index f4800bc4bb0a5e6bce5a04675337f07620a46241,a4bb243f35de4510e39c0fabb0c79a3a58e3c2fd..b7751f90a91033bd441d3afcbd937fb0ac45f7a3
--- 1/lwlib/ChangeLog
--- 2/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@@ -1,10 -1,3 +1,10 @@@
-       configure: new option --enable-gcc-warnings
 +2012-04-09  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.
 +      (ALL_CFLAGS): Use new macros rather than old.
 +
  2011-10-13  Dmitry Antipov  <dmantipov@yandex.ru>
  
        * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with

diff --cc oldXMenu/ChangeLog
index f5d65b49671e495d32c8b00807c421a2f9183437,1d3091c6bb4680703dfe23b52930408d35045ce5..87dadb2745e1cf79ae59edddcf5d24de9e6a4f5c
--- 1/oldXMenu/ChangeLog
--- 2/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@@ -1,10 -1,3 +1,10 @@@
-       configure: new option --enable-gcc-warnings
 +2012-04-09  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.
 +      (ALL_CFLAGS): Use new macros rather than old.
 +
  2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
  
        Static checks with GCC 4.6.0 and non-default toolkits.

diff --cc src/ChangeLog
index df3336b52e146b9fdde52e343084a5ae5d123689,f7889d99335e33a2cec9652666947af4d21c2ada..7027e9e5a95c2614d54713e1f62b98fb662551f2
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,35 +1,48 @@@
-       configure: new option --enable-gcc-warnings
 +2012-04-09  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.
 +      (ALL_CFLAGS): Use new macros rather than old.
 +      * process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
 +      * regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
 +      -Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
 +      -Wunused-result, -Wunused-variable.  This should go away once
 +      the Emacs and Gnulib regex code is merged.
 +      (xmalloc, xrealloc): Now static.
 +
+ 2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
+ 
+       * process.c (make_process):
+       * process.h: Add integer `gnutls_handshakes_tried' member to
+       process struct.
+ 
+       * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit.  Add
+       convenience `GNUTLS_LOG2i' macro.
+ 
+       * gnutls.c (gnutls_log_function2i): Convenience log function.
+       (emacs_gnutls_read): Use new log functions,
+       `gnutls_handshakes_tried' process member, and
+       `GNUTLS_EMACS_HANDSHAKES_LIMIT' to limit the number of handshake
+       attempts per process (connection).
+ 
+ 2012-04-09  Chong Yidong  <cyd@gnu.org>
+ 
+       * eval.c (Fuser_variable_p, user_variable_p_eh)
+       (lisp_indirect_variable): Functions deleted.
+       (Fdefvar): Caller changed.
+ 
+       * callint.c (Finteractive, Fcall_interactively):
+       * minibuf.c (Fread_variable): Callers changed.
+ 
+ 2012-04-09  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * xdisp.c (set_cursor_from_row): If the display string appears in
+       the buffer at position that is closer to point than the position
+       after the display string, display the cursor on the first glyph of
+       the display string.  Fixes cursor display when a 'display' text
+       property immediately follows invisible text.  (Bug#11094)
+ 
  2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
  
        composite.c: use 'double' consistently

diff --cc src/process.c
Simple merge