Mercurial > emacs
comparison src/xterm.h @ 83652:5b644ae74c91
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 13 Aug 2007 13:51:08 +0000 |
parents | 65663fcd2caa e5a68f18fcb9 |
children | 4f5a9f3d91ae bdb3fe0ba9fa |
comparison
equal
deleted
inserted
replaced
83651:47230f3f349b | 83652:5b644ae74c91 |
---|---|
254 int mouse_face_image_state; | 254 int mouse_face_image_state; |
255 | 255 |
256 char *x_id_name; | 256 char *x_id_name; |
257 | 257 |
258 /* The number of fonts actually stored in x_font_table. | 258 /* The number of fonts actually stored in x_font_table. |
259 font_table[n] is used and valid iff 0 <= n < n_fonts. 0 <= | 259 font_table[n] is used and valid if 0 <= n < n_fonts. 0 <= |
260 n_fonts <= font_table_size and font_table[i].name != 0. */ | 260 n_fonts <= font_table_size and font_table[i].name != 0. */ |
261 int n_fonts; | 261 int n_fonts; |
262 | 262 |
263 /* Pointer to bitmap records. */ | 263 /* Pointer to bitmap records. */ |
264 struct x_bitmap_record *bitmaps; | 264 struct x_bitmap_record *bitmaps; |