Merge from emacs-23

[gnu-emacs] / src / xterm.h

diff --git a/src/xterm.h b/src/xterm.h
index ec99a659b8e4d9f10eb40d29d2971e306385660f..1d144b3b704afaea88f89098ba0ad94b40a9bdfe 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -337,10 +337,10 @@ struct x_display_info
   Window net_supported_window;
   Atom Xatom_net_window_type, Xatom_net_window_type_tooltip;
 
-  /* Atoms dealing with maximization and fullscreen */
+  /* Atoms dealing with EWMH (i.e. _NET_...) */
   Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom,
     Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert,
-    Xatom_net_wm_state_sticky;
+    Xatom_net_wm_state_sticky, Xatom_net_frame_extents;
 
   /* XSettings atoms and windows.  */
   Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr;