Mercurial > emacs
diff src/window.h @ 91041:bdb3fe0ba9fa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 11 Oct 2007 16:22:07 +0000 |
parents | 424b655804ca 96eb42c9e0e3 |
children | 606f2d163a64 |
line wrap: on
line diff
--- a/src/window.h Thu Oct 11 16:14:00 2007 +0000 +++ b/src/window.h Thu Oct 11 16:22:07 2007 +0000 @@ -92,7 +92,7 @@ { /* The first two fields are really the header of a vector */ /* The window code does not refer to them. */ - EMACS_INT size; + EMACS_UINT size; struct Lisp_Vector *vec_next; /* The frame this window is on. */ Lisp_Object frame; @@ -744,7 +744,7 @@ /* Nil or a symbol naming the window system under which emacs is running ('x is the only current possibility) */ -extern Lisp_Object Vwindow_system; +extern Lisp_Object Vinitial_window_system; /* Version number of X windows: 10, 11 or nil. */