Mercurial > emacs
comparison src/xterm.h @ 90667:dbe3f29e61d6
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 505-522)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: etc/TUTORIAL.cn: Updated.
- Merge from erc--emacs--22
* gnus--rel--5.10 (patch 164-167)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 21 Nov 2006 08:56:38 +0000 |
parents | a1a25ac6c88a e240939ffc28 |
children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
90666:00d54c8fa693 | 90667:dbe3f29e61d6 |
---|---|
389 X_WMTYPE_A, | 389 X_WMTYPE_A, |
390 X_WMTYPE_B | 390 X_WMTYPE_B |
391 } wm_type; | 391 } wm_type; |
392 | 392 |
393 | 393 |
394 /* Atoms that are drag and drop atoms */ | 394 /* Atoms that are drag and drop atoms */ |
395 Atom *x_dnd_atoms; | 395 Atom *x_dnd_atoms; |
396 size_t x_dnd_atoms_size; | 396 size_t x_dnd_atoms_size; |
397 size_t x_dnd_atoms_length; | 397 size_t x_dnd_atoms_length; |
398 | |
399 int have_net_atoms; | |
398 }; | 400 }; |
399 | 401 |
400 #ifdef HAVE_X_I18N | 402 #ifdef HAVE_X_I18N |
401 /* Whether or not to use XIM if we have it. */ | 403 /* Whether or not to use XIM if we have it. */ |
402 extern int use_xim; | 404 extern int use_xim; |