diff options
| author | Stefan Monnier | 2010-11-09 15:07:10 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-11-09 15:07:10 -0500 |
| commit | d607b96bc2824116a8fe0e5840ce49da7ce4514f (patch) | |
| tree | 229a11bba88b67e8961db4d10aa8b3725f3a4873 /src/xterm.h | |
| parent | 27410d0ac3406a341cc90ada064047a7f1ea5209 (diff) | |
| parent | c00980655bc15ca019fd6c559c69601be18f2407 (diff) | |
| download | emacs-d607b96bc2824116a8fe0e5840ce49da7ce4514f.tar.gz emacs-d607b96bc2824116a8fe0e5840ce49da7ce4514f.zip | |
Merge from emacs-23
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xterm.h b/src/xterm.h index ec99a659b8e..1d144b3b704 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -337,10 +337,10 @@ struct x_display_info | |||
| 337 | Window net_supported_window; | 337 | Window net_supported_window; |
| 338 | Atom Xatom_net_window_type, Xatom_net_window_type_tooltip; | 338 | Atom Xatom_net_window_type, Xatom_net_window_type_tooltip; |
| 339 | 339 | ||
| 340 | /* Atoms dealing with maximization and fullscreen */ | 340 | /* Atoms dealing with EWMH (i.e. _NET_...) */ |
| 341 | Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom, | 341 | Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom, |
| 342 | Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert, | 342 | Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert, |
| 343 | Xatom_net_wm_state_sticky; | 343 | Xatom_net_wm_state_sticky, Xatom_net_frame_extents; |
| 344 | 344 | ||
| 345 | /* XSettings atoms and windows. */ | 345 | /* XSettings atoms and windows. */ |
| 346 | Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr; | 346 | Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr; |