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.c | |
| parent | 27410d0ac3406a341cc90ada064047a7f1ea5209 (diff) | |
| parent | c00980655bc15ca019fd6c559c69601be18f2407 (diff) | |
| download | emacs-d607b96bc2824116a8fe0e5840ce49da7ce4514f.tar.gz emacs-d607b96bc2824116a8fe0e5840ce49da7ce4514f.zip | |
Merge from emacs-23
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c index 7297ee71f0f..4c0493891e3 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10278,6 +10278,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 10278 | = XInternAtom (dpyinfo->display, "_NET_WM_ICON_NAME", False); | 10278 | = XInternAtom (dpyinfo->display, "_NET_WM_ICON_NAME", False); |
| 10279 | dpyinfo->Xatom_net_wm_name | 10279 | dpyinfo->Xatom_net_wm_name |
| 10280 | = XInternAtom (dpyinfo->display, "_NET_WM_NAME", False); | 10280 | = XInternAtom (dpyinfo->display, "_NET_WM_NAME", False); |
| 10281 | dpyinfo->Xatom_net_frame_extents | ||
| 10282 | = XInternAtom (dpyinfo->display, "_NET_FRAME_EXTENTS", False); | ||
| 10281 | 10283 | ||
| 10282 | dpyinfo->x_dnd_atoms_size = 8; | 10284 | dpyinfo->x_dnd_atoms_size = 8; |
| 10283 | dpyinfo->x_dnd_atoms_length = 0; | 10285 | dpyinfo->x_dnd_atoms_length = 0; |