--- a/src/frame.h	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/frame.h	Mon Aug 13 09:02:59 2007 +0200
@@ -112,16 +112,6 @@
 #include "frameslots.h"
 #undef MARKED_SLOT
 
-    /* Nonzero if frame is currently displayed.
-       Mutally exclusive with iconfied
-       JV: This now a tristate flag:
-Value : Emacs meaning                           :f-v-p : X meaning
-0     : not displayed                           : nil  : unmapped
->0    : user can access it,needs repainting     : t    : mapped and visible
-<0    : user can access it,needs no repainting  : hidden :mapped and invisible
-     where f-v-p is the return value of frame-visible-p */
-  int visible;
-
   /* one-bit flags: */
 
   /* Are we finished initializing? */
@@ -136,6 +126,9 @@
   /* Nonzero if last attempt at redisplay on this frame was preempted.  */
   unsigned int display_preempted :1;
 
+  /* Nonzero if frame is currently displayed.  */
+  unsigned int visible :1;
+
   /* Nonzero if window is currently iconified.
      This and visible are mutually exclusive.  */
   unsigned int iconified :1;
@@ -176,7 +169,7 @@
   unsigned int mirror_dirty :1;
 
   /* flag indicating if any window on this frame is displaying a subwindow */
-  unsigned int subwindows_being_displayed :1;
+  int subwindows_being_displayed :1;
 };
 
 /* If this is non-nil, it is the frame that make-frame is currently
@@ -339,7 +332,6 @@
 #define FRAME_CURSOR_X(f) ((f)->cursor_x)
 #define FRAME_CURSOR_Y(f) ((f)->cursor_y)
 #define FRAME_VISIBLE_P(f) ((f)->visible)
-#define FRAME_REPAINT_P(f) ((f)->visible>0)      
 #define FRAME_NO_SPLIT_P(f) ((f)->no_split)
 #define FRAME_ICONIFIED_P(f) ((f)->iconified)
 #define FRAME_FOCUS_FRAME(f) ((f)->focus_frame)