Mercurial > emacs

comparison src/xterm.c @ 111449:132f2dfd549f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 09 Nov 2010 15:07:10 -0500
parents d53ee71e7e89 ee70db35f80f
children 4f757d8e8ed7
comparison
equal deleted inserted replaced
111448:321fbae3e04d 111449:132f2dfd549f
10276 = XInternAtom (dpyinfo->display, "_NET_WM_WINDOW_TYPE_TOOLTIP", False); 10276 = XInternAtom (dpyinfo->display, "_NET_WM_WINDOW_TYPE_TOOLTIP", False);
10277 dpyinfo->Xatom_net_wm_icon_name 10277 dpyinfo->Xatom_net_wm_icon_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;
10284 dpyinfo->x_dnd_atoms = xmalloc (sizeof (*dpyinfo->x_dnd_atoms) 10286 dpyinfo->x_dnd_atoms = xmalloc (sizeof (*dpyinfo->x_dnd_atoms)
10285 * dpyinfo->x_dnd_atoms_size); 10287 * dpyinfo->x_dnd_atoms_size);