Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index c11ecb7e3ae7d94ccdb53a16487eba09fd837374..f0ed9e74745d2e6920ba6e1ef3e4901d23101a09 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * gtkutil.c (xg_display_open):
+       * xterm.c (x_display_ok, x_term_init): Block SIGIO when opening
+       a display (Bug#19175).
+
 2015-03-29  Martin Rudalics  <rudalics@gmx.at>
 
        * gtkutil.c (update_theme_scrollbar_width): Don't round up