Merge from trunk.

1 files changed, 25 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 272354c48d1..0b4da8f5e40 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -786,6 +786,31 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2011-10-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented
+        past the beginning of the current glyph matrix.
+
+2011-10-30  Adam Sjøgren <asjo@koldfront.dk> (tiny change)
+
+        * xterm.c: Include X11/Xproto.h if HAVE_GTK3.
+        (x_error_handler): Ignore BadMatch for X_SetInputFocus for
+        HAVE_GTK3 (Bug#9869).
+
+        * gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize
+        type to GDK_NOTHING so valgrind does not complain (Bug#9901).
+
+        * xterm.h (x_display_info): Add Xatom_net_wm_state_hidden (Bug#9893).
+
+        * xterm.c: Declare x_handle_net_wm_state to return int.
+        (handle_one_xevent): Check if we are iconified but don't have
+        _NET_WM_STATE_HIDDEN.  If do, treat as deiconify (Bug#9893).
+        (get_current_wm_state): Return non-zero if not hidden,
+        check for _NET_WM_STATE_HIDDEN (Bug#9893).
+        (do_ewmh_fullscreen): Ignore return value from get_current_wm_state.
+        (x_handle_net_wm_state): Return what get_current_wm_state returns.
+        (x_term_init): Initialize dpyinfo->Xatom_net_wm_state_hidden.
+
 2011-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 
         * alloc.c (which_symbols): Declare EXTERNALLY_VISIBLE,