summaryrefslogtreecommitdiff
path: root/src/xterm.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-10-31 13:03:15 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-10-31 13:03:15 -0700
commit5b0d046d5b6a6743be6888d02352b878151e1d6c (patch)
treeb7ea751ee33c18d1b5f7fa9b94a5a9fe010c8468 /src/xterm.h
parent1fa2385302f5b2e5bb17c8aad3cb4e320512ca46 (diff)
parent07f3add98f088ff068aacb0429210900e95b90c3 (diff)
downloademacs-5b0d046d5b6a6743be6888d02352b878151e1d6c.tar.gz
emacs-5b0d046d5b6a6743be6888d02352b878151e1d6c.tar.bz2
emacs-5b0d046d5b6a6743be6888d02352b878151e1d6c.zip
Merge from trunk.
Diffstat (limited to 'src/xterm.h')
-rw-r--r--src/xterm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xterm.h b/src/xterm.h
index d244aa4be0b..af2e94ed112 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -341,7 +341,8 @@ struct x_display_info
/* Atoms dealing with EWMH (i.e. _NET_...) */
Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen,
Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert,
- Xatom_net_wm_state_sticky, Xatom_net_frame_extents;
+ Xatom_net_wm_state_sticky, Xatom_net_wm_state_hidden,
+ Xatom_net_frame_extents;
/* XSettings atoms and windows. */
Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr;