Merge branch 'master' into cairo

[gnu-emacs] / src / ChangeLog.13

diff --git a/src/ChangeLog b/src/ChangeLog.13
similarity index 99%
rename from src/ChangeLog
rename to src/ChangeLog.13
index 780700724386053286edb5f861e347f24434dbce..8057b6e75d68cbff8cc90679d9cf0190d7f658a7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog.13
@@ -31,6 +31,12 @@
        (tiff_load): Create cairo image surface if USE_CAIRO.
        (gif_load): Ditto.
 
+2015-04-06  Koichi Arakawa  <arakawa@pp.iij4u.or.jp>  (tiny change)
+
+       * w32proc.c (w32_executable_type): Look for the DLL name in the
+       correct section.  This avoids segfaults with some executables.
+       (Bug#20264)
+
 2015-04-05  Jan Djärv  <jan.h.d@swipnet.se>
 
        * image.c: #undef COLOR_TABLE_SUPPORT when USE_CAIRO.
@@ -40,6 +46,15 @@
 
        * dispextern.h (struct image): add cr_data2 if cairo.
 
+2015-04-04  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xselect.c (x_reply_selection_request)
+       (receive_incremental_selection): Call set_property_change_object
+       inside block_input.
+       (wait_for_property_change): Move set property_change_reply(_object)
+       outside of this function (Bug#16737).
+       (set_property_change_object): New function.
+
 2015-04-03  Jan Djärv  <jan.h.d@swipnet.se>
 
        * image.c (prepare_image_for_display): Don't load if USE_CAIRO.
@@ -160,7 +175,7 @@
        Fix minor ldexp issues
        * floatfns.c (Fldexp): Require 2 args.  Avoid undefined behavior
        if the exponent is out of 'int' range.  Improve documentation.
-       Fixes: bug#20185
+       (Bug#20185)
 
 2015-03-24  Daniel Colascione  <dancol@dancol.org>
 
@@ -251,7 +266,7 @@
 
        Work around x86 glibc backtrace bug
        * sysdep.c (emacs_backtrace): Don't dump core on x86.
-       Fixes: bug#19959
+       (Bug#19959)
 
 2015-03-05  Eli Zaretskii  <eliz@gnu.org>
 
@@ -1300,7 +1315,7 @@
        to unused args.
        * lisp.h (CALLMANY, CALLN): New macros.
        * sound.c (Fplay_sound_internal): Coalesce duplicate code.
-       Fixes: bug#19634
+       (Bug#19634)
 
        Use gnustep-config if available
        * emacs.c [NS_IMPL_GNUSTEP]: Don't include <GNUstepBase/GSConfig.h>.
@@ -1324,7 +1339,7 @@
 
        Don't downcase system diagnostics' first letters
        * fileio.c (report_file_errno): Don't downcase, and simplify.
-       Fixes: bug#19642
+       (Bug#19642)
 
        Isolate NIL_IS_ZERO-assuming code better
        Suggested by Stefan Monnier in:
@@ -1369,7 +1384,7 @@
 
        Correct an old fix for GTK font selection
        * gtkutil.c (xg_get_font): Fix off-by-2 typo.
-       Fixes: bug#3228
+       (Bug#3228)
 
        Fix minor bugs with printing null bytes
        * minibuf.c (read_minibuf_noninteractive):
@@ -2358,7 +2373,7 @@
        * fileio.c (Finsert_file_contents): Compute same_at_end character
        position using the old buffer size, not the new one, since
        restore_window_points wants the old size.
-       Fixes: debbugs:19161
+       (Bug#19161)
 
 2014-12-14  Alan Mackenzie  <acm@muc.de>