merge from trunk; clean up some issues

1 files changed, 219 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 2fcd7c77114..22607d59529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,218 @@
+2013-06-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * configure.ac (file-notification): New option, replaces inotify option.
+        (HAVE_W32): Remove w32notify.o.
+        (with_file_notification): Add checks for glib and w32. Adapt check
+        for inotify.
+        (Summary): Add entry for file notification.
+
+        * autogen/config.in: Add entries for HAVE_GFILENOTIFY,
+        HAVE_W32NOTIFY and USE_FILE_NOTIFY.
+
+2013-06-02  Juanma Barranquero  <lekktu@gmail.com>
+
+        * .bzrignore: Ignore dirs libexec/, share/ and var/.
+
+2013-05-29  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * INSTALL: Fix description.
+
+2013-05-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * configure.ac (HAVE_XRANDR): Check availability of
+        XRRGetScreenResources rather than that of XRRQueryExtension.
+
+2013-05-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * make-dist (files): Add nt/msysconfig.sh, nt/mingw-cfg.site,
+        nt/epaths.nt, and nt/INSTALL.MSYS.
+
+2013-05-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port --enable-gcc-warnings to clang.
+        * configure.ac (nw): Remove obsolescent warnings.
+        These aren't needed for clang, or for gcc for that matter.
+        (emacs_cv_clang): New var, which tests for clang.
+        Omit warnings that clang is too picky about.
+        (GLIB_DISABLE_DEPRECATION_WARNINGS): Define this;
+        needed for Ubuntu 13.04 + clang + --enable-gcc-warnings.
+
+        * make-dist (files): Add nt/Makefile.in, nt/gnulib.mk.
+        Otherwise, 'configure; make' fails on non-Windows builds.
+
+2013-05-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * lib/Makefile.am: If building for MS-Windows, include
+        nt/gnulib.mk instead of lib/gnulib.mk.
+
+        * configure.ac: Adapt to MSYS build on MS-Windows.
+
+        * Makefile.in (NTDIR): New variable, for the MSYS build on
+        MS-Windows.
+        (SUBDIR): Add $(NTDIR).
+        (.PHONY): Add epaths-force-w32.
+        (msys_to_w32): New variable.
+        (epaths-force-w32, install-nt, uninstall-nt): New targets.
+        (lib-src src): Add $(NTLIB) to prerequisites.
+        (lib lib-src lisp leim nt): Add 'nt'.
+        (config.status): Use $(CFG).
+        (.PHONY): Add install-$(NTDIR) and uninstall-$(NTDIR).
+        (install, install-arch-dep): Add install-$(NTDIR).
+        (uninstall): Depend on uninstall-$(NTDIR).
+        (mostlyclean, clean, distclean, bootstrap-clean): Add 'nt'.
+
+        * GNUmakefile (CFG): New variable, uses mingw-cfg.site as
+        CONFIG_SITE for the MSYS build on MS-Windows.
+        (Makefile): Use $(CFG).
+
+        * .bzrignore: Ignore *.res, *.tmp, and *.map.  Remove
+        src/emacs.res.
+
+2013-05-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-05-15 manywarnings: update for GCC 4.8.0
+        2013-05-15 stdio: use __REDIRECT for fwrite, fwrite_unlocked
+        2013-05-15 sig2str, stdio, warnings: port to clang
+
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in (install-doc): DOC file is not version specific any more.
+        * .bzrignore: Don't ignore DOC-* any more.
+
+2013-05-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -nopie.
+        Reported privately by Han Boetes <han@boetes.org>.
+
+2013-05-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lib/makefile.w32-in (ACL_H): New macro.
+        ($(BLD)/acl-errno-valid.$(O)): Update dependencies.
+
+2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
+        * configure.ac: Remove -with-acl option, since Gnulib does that for
+        us now.
+        (LIBACL_LIBS): Remove; no longer needed.
+        * lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
+        for the benefit of the new ACL implementation.
+        * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
+        ($(BLD)/acl-errno-valid.$(O)): New rule.
+        * lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
+        * lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
+        * lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
+        New files, taken from gnulib.
+        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
+2013-05-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * configure.ac (HAVE_XRANDR, HAVE_XINERAMA): Define if available.
+        (XRANDR_LIBS, XINERAMA_LIBS): New AC_SUBSTs.
+
+2013-05-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-04-30 utimens, utimensat: work around Solaris UTIME_OMIT bug
+
+2013-05-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-dist: Keep necessary restrictions on file access.
+
+2013-04-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-04-28 extern-inline: work around bug in Sun c99
+
+2013-04-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-04-27 alignof, intprops, malloca: port better to IBM's C compiler
+
+2013-04-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port better to AIX (Bug#14258).
+        * configure.ac (CFLAGS): Append -O if the user did not specify CFLAGS,
+        we did not already infer an optimization option, and -O works.
+        AIX xlc needs -O, otherwise garbage collection doesn't work.
+
+2013-04-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-dist: Do not distribute admin/unidata/Makefile.
+        It is generated by 'configure'.
+
+        * build-aux/update-subdirs: Don't leave subdirs.el~ behind.
+        It messes up 'make distclean', and contains no useful information
+        because it's a copy of subdirs.el.
+
+2013-04-18  John Marino  <gnugcc@marino.st>  (tiny change)
+
+        * configure.ac: Add DragonFly BSD, mostly same as FreeBSD.  (Bug#14068)
+
+2013-04-18  Glenn Morris  <rgm@gnu.org>
+
+        * configure.ac (AC_PROG_LN_S): Remove, too restrictive.
+        (LN_S_FILEONLY): New output variable.
+        * Makefile.in (LN_S): Remove.
+        (LN_S_FILEONLY): New, set by configure.
+        (install-arch-dep): Use LN_S_FILEONLY rather than LN_S.
+
+2013-04-12  Ken Brown  <kbrown@cornell.edu>
+
+        * configure.ac (canonical): Adapt to 64-bit Cygwin, for which
+        `canonical' is `x86_64-unknown-cygwin'.
+
+2013-04-09  Ken Brown  <kbrown@cornell.edu>
+
+        * configure.ac (W32_RES_LINK): Remove unneeded linker directive
+        `-Wl,-bpe-i386', which is confusing in the 64-bit case.
+        (Bug#12993)
+
+2013-04-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).
+        * configure.ac (LD_SWITCH_SYSTEM_TEMACS): Append -pg if profiling
+        and if not on GNU/Linux or FreeBSD.
+        * lib/Makefile.am (AM_CFLAGS): Add $(PROFILING_CFLAGS), so that
+        lib/*.o is profiled too.
+
+2013-03-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-03-29 stdalign: port to stricter ISO C11
+        This helps to run 'configure' on MS-Windows; see Eli Zaretskii in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00999.html>.
+
+2013-03-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac (HAVE_XKBGETKEYBOARD): Remove.
+        Subsumed by HAVE_XKB.  All uses changed.
+
+2013-03-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * configure.ac (HAVE_XKB): Define if Xkb is present.
+
+2013-03-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-03-21 sys_select, sys_time: port 2013-01-30 fix to Cygwin
+
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix bug when building Emacs with a GNU Make submake (Bug#13962).
+        * Makefile.in (QUIET_SUBMAKE): New macro.
+        (install-info, uninstall): Use it.
+
+        Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
+        * configure.ac (IMAGEMAGICK_MODULE): Reject 6.8.2.
+        We want to reject 6.8.2-3 through 6.8.3-9, but there seems to be
+        no way to do this in pkg-config, so make do with a reasonable
+        approximation.
+
+        Automate the build of ja-dic.el (Bug#13984).
+        * .bzrignore: Add leim/ja-dic/.
+
 2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         File synchronization fixes (Bug#13944).
@@ -14,6 +229,10 @@
         2013-03-11 putenv: avoid compilation warning on mingw
         2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod.
 
+2013-03-11  Glenn Morris  <rgm@gnu.org>
+
+        * Merge in all changes up to version 24.3 release.
+
 2013-03-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872).
@@ -47,11 +266,6 @@
         not always needed.
         (HAVE_DATA_START): New macro.
 
-2013-02-18  Aidan Gauland  <aidalgol@no8wireless.co.nz>
-
-        * lisp/eshell/em-cmpl.el: Corrected "context-related help"
-        keybinding in commentary.
-
 2013-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         Parallelize documentation builds.
@@ -64,11 +278,6 @@
         (info-real): Depend on $(INFOS) rather than doing it sequentially.
         (dvi): Depend on $(DVIS) rather than doing it sequentially.
 
-2013-02-18  Aidan Gauland  <aidalgol@no8wireless.co.nz>
-
-        * doc/misc/eshell.texi: Added documentation for Eshell insert
-        output redirection operator, >>>.
-
 2013-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix AIX port (Bug#13650).