Mercurial > emacs
comparison src/xterm.h @ 90580:7f3f771c85fa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 382-398)
- Update from CVS
- Update from erc--emacs--22
- Fix ERC bug introduced in last patch
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 123-125)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 16 Aug 2006 14:08:49 +0000 |
parents | 138027c8c982 5f6d1ddc1872 |
children | a1a25ac6c88a |
comparison
equal
deleted
inserted
replaced
90579:c78f05b8f09e | 90580:7f3f771c85fa |
---|---|
387 { | 387 { |
388 X_WMTYPE_UNKNOWN, | 388 X_WMTYPE_UNKNOWN, |
389 X_WMTYPE_A, | 389 X_WMTYPE_A, |
390 X_WMTYPE_B | 390 X_WMTYPE_B |
391 } wm_type; | 391 } wm_type; |
392 | |
393 | |
394 /* Atoms that are drag and drop atoms */ | |
395 Atom *x_dnd_atoms; | |
396 size_t x_dnd_atoms_size; | |
397 size_t x_dnd_atoms_length; | |
392 }; | 398 }; |
393 | 399 |
394 #ifdef HAVE_X_I18N | 400 #ifdef HAVE_X_I18N |
395 /* Whether or not to use XIM if we have it. */ | 401 /* Whether or not to use XIM if we have it. */ |
396 extern int use_xim; | 402 extern int use_xim; |