Mercurial > emacs
comparison src/macterm.h @ 83560:738ce3540ffb
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-660
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-661
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-662
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-663
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-664
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-665
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-666
Fix read-only prompt problem in isearch
* emacs@sv.gnu.org/emacs--devo--0--patch-667
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-668
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-669
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-670
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-671
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-672
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-673
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-206
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-207
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-208
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600
author | Karoly Lorentey <karoly@lorentey.hu> |
---|---|
date | Sun, 22 Apr 2007 12:12:29 +0000 |
parents | 07774e5c3ff5 2ebc26a83cc7 |
children | 5da6a46ddbd6 |
comparison
equal
deleted
inserted
replaced
83559:edf631bdbb7a | 83560:738ce3540ffb |
---|---|
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 |