Mercurial > emacs
comparison src/macterm.h @ 90787:91bf6e05918b
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 662-669)
- Update from CVS
- Fix read-only prompt problem in isearch
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 207-208)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 18 Mar 2007 14:11:08 +0000 |
| parents | dd7c098af727 2ebc26a83cc7 |
| children | e9f94688a064 |
comparison
equal
deleted
inserted
replaced
| 90786:ca12f314faac | 90787:91bf6e05918b |
|---|---|
| 324 black_relief, white_relief; | 324 black_relief, white_relief; |
| 325 | 325 |
| 326 /* The background for which the above relief GCs were set up. | 326 /* The background for which the above relief GCs were set up. |
| 327 They are changed only when a different background is involved. */ | 327 They are changed only when a different background is involved. */ |
| 328 unsigned long relief_background; | 328 unsigned long relief_background; |
| 329 | |
| 330 /* Width of the internal border. */ | |
| 331 int internal_border_width; | |
| 329 | 332 |
| 330 /* Hints for the size and the position of a window. */ | 333 /* Hints for the size and the position of a window. */ |
| 331 XSizeHints *size_hints; | 334 XSizeHints *size_hints; |
| 332 | 335 |
| 333 #if USE_CG_DRAWING | 336 #if USE_CG_DRAWING |