Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

1 files changed, 70 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bad19f32a91..2e4156c3c79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+2013-07-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove some unused macros from 'configure'.
+        * configure.ac (HAVE_SOUNDCARD_H, HAVE_LINUX_VERSION_H, HAVE_SPEED_T)
+        (HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY)
+        (HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION, HAVE_UTIMES)
+        (HAVE_LIBHESIOD, HAVE_LIBRESOLV, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
+        (HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
+        (HAVE_LIBKRB4, HAVE_LIBKRB, HAVE_DES_H, HAVE_KERBEROSIV_DES_H)
+        (HAVE_DEV_PTMX, DEVICE_SEP, USG5):
+        Remove these macros, as they are not used.
+        (sys_siglist): Remove macro; src/sysdep.c now does this.
+
+        * configure.ac (GTK_COMPILES): Check API a bit more carefully.
+        Also check that it links.  Say whether it compiled and linked.
+
+2013-07-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-06-23 ignore-value: port to gcc -pedantic
+        2013-06-21 extern-inline: port to gcc -std=c89
+
+2013-06-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Do not use GTK 3 if it exists but cannot be compiled.
+        * configure.ac: Leave GTK_OBJ and term_header alone if GTK 3
+        exists but cannot be compiled.
+
+2013-06-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * Makefile.in (install-arch-indep): Do not create directories passed
+        with --enable-locallisppath.
+
+2013-06-24  Glenn Morris  <rgm@fencepost.gnu.org>
+
+        * configure.ac: Include X11/X.h when testing for Xft.h.  (Bug#14684)
+
+2013-06-22  Juanma Barranquero  <lekktu@gmail.com>
+
+        * .bzrignore: Add GNU idutils ID database file.
+
+2013-06-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * configure.ac (HAVE_LIBXML2): Try built-in libxml2 on OS X 10.8
+        as a fallback.
+
+2013-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * .bzrignore: Don't unignore cl-loaddefs.el.
+
+2013-06-20  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+        * configure.ac (log2): Check for this function.
+
+2013-06-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * .bzrignore: Add GNU GLOBAL files.
+
+2013-06-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use functions, not macros, for XINT etc.  (Bug#11935).
+        * configure.ac (WARN_CFLAGS): Remove -Wbad-function-cast,
+        as it generates bogus warnings about reasonable casts of calls.
+
+2013-06-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac: Report ACL usage at the end (Bug#14612).
+
 2013-06-11  Paul Eggert  <eggert@cs.ucla.edu>
 
         --without-all should imply --with-file-notification=no.  (Bug#14569)
@@ -383,7 +451,7 @@
 
 2013-01-23  Giorgos Keramidas  <gkeramidas@gmail.com>  (tiny change)
 
-        * .bzrignore: add lib-src/blessmail.
+        * .bzrignore: Add lib-src/blessmail.
 
 2013-01-23  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -532,7 +600,7 @@
 
 2012-12-10  Daniel Colascione  <dancol@dancol.org>
 
-        * .bzrignore: add src/emacs.res.
+        * .bzrignore: Add src/emacs.res.
 
         * configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
         build how to compile Windows resource files; use these variables