merge trunk

1 files changed, 71 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 88e385c876b..cfcd2b0e2f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,78 @@
-2012-09-15  Kenichi Handa  <handa@gnu.org>
+2012-09-16  Kenichi Handa  <handa@gnu.org>
 
         * font.c (Ffont_shape_gstring): Don't adjust grapheme cluster
         here, but just check the validity of glyphs in the glyph-string.
 
+2012-09-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fwindow_parameter, Fset_window_parameter): Accept
+        any window as argument (Bug#12452).
+
+2012-09-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (Fx_open_connection): Move initialization of ns_*_types
+        to ns_term_init to avoid memory leak.
+
+        * nsterm.m (ns_update_begin): Initialize bp after lcokFocus, use
+        explicit retain/release.
+        (ns_term_init): Only allow one display.  Initialize outerpool and
+        ns_*_types.
+
+2012-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port _setjmp fix to POSIXish hosts as well as Microsoft.
+        * image.c (_setjmp) [!HAVE__SETJMP]: Restore definition, as
+        it's needed on POSIXish hosts that lack _setjmp.  Attempt to solve
+        the Microsoft problem in a different way, by altering ../nt/config.nt.
+
+2012-09-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32xfns.c:
+        * w32uniscribe.c:
+        * w32term.c:
+        * w32select.c:
+        * w32reg.c:
+        * w32proc.c:
+        * w32menu.c:
+        * w32inevt.c:
+        * w32heap.c:
+        * w32font.c:
+        * w32fns.c:
+        * w32console.c:
+        * w32.c:
+        * w16select.c: Remove inclusion of setjmp.h, as it is now included
+        by lisp.h.  This completes removal of setjmp.h inclusion
+        erroneously announced in the previous commit.  (Bug#12446)
+
+        * lisp.h [!HAVE__SETJMP, !HAVE_SIGSETJMP]: Make the commentary
+        more accurate.
+
+        * image.c (_setjmp) [!HAVE__SETJMP]: Define only if 'setjmp' is
+        not defined as a macro.  The latter happens on MS-Windows.
+        (Bug#12446)
+
+2012-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port better to POSIX hosts lacking _setjmp (Bug#12446).
+        * lisp.h: Include <setjmp.h> here, since we use its symbols here.
+        Some instances of '#include <setjmp.h>' removed, if the
+        only reason for the instance was because "lisp.h" was included.
+        (sys_jmp_buf, sys_setjmp, sys_longjmp): New symbols.
+        Unless otherwise specified, replace all uses of jmp_buf, _setjmp,
+        and _longjmp with the new symbols.  Emacs already uses _setjmp if
+        available, so this change affects only POSIXish hosts that have
+        sigsetjmp but not _setjmp, such as some versions of Solaris and
+        Unixware.  (Also, POSIX-2008 marks _setjmp as obsolescent.)
+        * image.c (_setjmp, _longjmp) [HAVE_PNG && !HAVE__SETJMP]: New macros.
+        (png_load_body) [HAVE_PNG]:
+        (PNG_LONGJMP) [HAVE_PNG && PNG_LIBPNG_VER < 10500]:
+        (PNG_JMPBUF) [HAVE_PNG && PNG_LIBPNG_VER >= 10500]:
+        Use _setjmp and _longjmp rather than sys_setjmp and sys_longjmp,
+        since PNG requires jmp_buf.  This is the only exception to the
+        general rule that we now use sys_setjmp and sys_longjmp.
+        This exception is OK since this code does not change the signal
+        mask or longjmp out of a signal handler.
+
 2012-09-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]: