# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1221784542 0
# Node ID 05d5848d935c18a82701667cbfdc54c22d8cb0c2
# Parent  e37978ef9db9ee4d7f3b351c5857c3f57ac6b032
* frame.h (struct frame): Move alpha from the middle of bitfields.

* window.h (struct window): Move frozen_window_start_p after the
rest of the bitfields to reduce padding.

diff -r e37978ef9db9 -r 05d5848d935c src/ChangeLog
--- a/src/ChangeLog	Thu Sep 18 18:21:05 2008 +0000
+++ b/src/ChangeLog	Fri Sep 19 00:35:42 2008 +0000
@@ -1,3 +1,10 @@
+2008-09-18  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* frame.h (struct frame): Move alpha from the middle of bitfields.
+
+	* window.h (struct window): Move frozen_window_start_p after the
+	rest of the bitfields to reduce padding.
+
 2008-09-18  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xterm.h (x_display_info): Remove `height' and `width' members.
@@ -38,6 +45,7 @@
 	* xmenu.c (menu_position_func): Use x_display_pixel_height and
 	x_display_pixel_width.
 
+>>>>>>> 1.6978
 2008-09-18  Kenichi Handa  <handa@m17n.org>
 
 	* composite.c (fill_gstring_header): Don't check FROM and TO here.
@@ -143,6 +151,7 @@
 	* indent.c (Fvertical_motion): Be sure to set
 	it_overshoot_expected if it.cmp_it.id is non-nengative.
 
+>>>>>>> 1.6977
 2008-09-07  Andreas Schwab  <schwab@suse.de>
 
 	* callproc.c (Fcall_process): Don't hold references to string data
diff -r e37978ef9db9 -r 05d5848d935c src/frame.h
--- a/src/frame.h	Thu Sep 18 18:21:05 2008 +0000
+++ b/src/frame.h	Fri Sep 19 00:35:42 2008 +0000
@@ -216,11 +216,6 @@
      be used for output.  */
   unsigned glyphs_initialized_p : 1;
 
-  /* frame opacity
-     alpha[0]: alpha transparency of the active frame
-     alpha[1]: alpha transparency of inactive frames   */
-  double alpha[2];
-
   /* Set to non-zero in change_frame_size when size of frame changed
      Clear the frame in clear_garbaged_frames if set.  */
   unsigned resized_p : 1;
@@ -485,6 +480,11 @@
   /* The baud rate that was used to calculate costs for this frame.  */
   int cost_calculation_baud_rate;
 
+  /* frame opacity
+     alpha[0]: alpha transparency of the active frame
+     alpha[1]: alpha transparency of inactive frames   */
+  double alpha[2];
+
   /* Exponent for gamma correction of colors.  1/(VIEWING_GAMMA *
      SCREEN_GAMMA) where viewing_gamma is 0.4545 and SCREEN_GAMMA is a
      frame parameter.  0 means don't do gamma correction.  */
diff -r e37978ef9db9 -r 05d5848d935c src/window.h
--- a/src/window.h	Thu Sep 18 18:21:05 2008 +0000
+++ b/src/window.h	Fri Sep 19 00:35:42 2008 +0000
@@ -280,6 +280,11 @@
        Currently only used for menu bar windows of frames.  */
     unsigned pseudo_window_p : 1;
 
+    /* 1 means the window start of this window is frozen and may not
+       be changed during redisplay.  If point is not in the window,
+       accept that.  */
+    unsigned frozen_window_start_p : 1;
+
     /* Amount by which lines of this window are scrolled in
        y-direction (smooth scrolling).  */
     int vscroll;
@@ -287,11 +292,6 @@
     /* Z_BYTE - the buffer position of the last glyph in the current matrix
        of W.  Only valid if WINDOW_END_VALID is not nil.  */
     int window_end_bytepos;
-
-    /* 1 means the window start of this window is frozen and may not
-       be changed during redisplay.  If point is not in the window,
-       accept that.  */
-    unsigned frozen_window_start_p : 1;
 };
 
 /* 1 if W is a minibuffer window.  */