--- a/src/redisplay.c	Mon Aug 13 11:35:05 2007 +0200
+++ b/src/redisplay.c	Mon Aug 13 11:36:19 2007 +0200
@@ -464,8 +464,7 @@
 
 Lisp_Object Qtop_bottom;
 
-#define WINDOW_SCROLLED(w) \
-(w->hscroll > 0 || w->left_xoffset)
+#define WINDOW_SCROLLED(w) ((w)->hscroll > 0 || (w)->left_xoffset)
 
 
 /***************************************************************************/
@@ -9286,7 +9285,7 @@
 
   DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
 String or glyph to display as an arrow.  See also `overlay-arrow-position'.
-(Note that despite the name of this variable, it can be set to a glyph as
+\(Note that despite the name of this variable, it can be set to a glyph as
 well as a string.)
 */ ,
 		     redisplay_variable_changed);
@@ -9451,7 +9450,7 @@
 			 offsetof (struct window, left_margin_width),
 			 some_window_value_changed,
 			 offsetof (struct frame, left_margin_width),
-			 margin_width_changed_in_frame);
+			 margin_width_changed_in_frame, 0);
 
   DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
 *Width of right margin.
@@ -9463,7 +9462,7 @@
 			 offsetof (struct window, right_margin_width),
 			 some_window_value_changed,
 			 offsetof (struct frame, right_margin_width),
-			 margin_width_changed_in_frame);
+			 margin_width_changed_in_frame, 0);
 
   DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
 *Minimum ascent height of lines.
@@ -9474,7 +9473,7 @@
   set_specifier_caching (Vminimum_line_ascent,
 			 offsetof (struct window, minimum_line_ascent),
 			 some_window_value_changed,
-			 0, 0);
+			 0, 0, 0);
 
   DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
 *Minimum descent height of lines.
@@ -9485,7 +9484,7 @@
   set_specifier_caching (Vminimum_line_descent,
 			 offsetof (struct window, minimum_line_descent),
 			 some_window_value_changed,
-			 0, 0);
+			 0, 0, 0);
 
   DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
 *Non-nil means use the left outside margin as extra whitespace when
@@ -9497,7 +9496,7 @@
   set_specifier_caching (Vuse_left_overflow,
 			 offsetof (struct window, use_left_overflow),
 			 some_window_value_changed,
-			 0, 0);
+			 0, 0, 0);
 
   DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
 *Non-nil means use the right outside margin as extra whitespace when
@@ -9509,7 +9508,7 @@
   set_specifier_caching (Vuse_right_overflow,
 			 offsetof (struct window, use_right_overflow),
 			 some_window_value_changed,
-			 0, 0);
+			 0, 0, 0);
 
   DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
 *Non-nil means the text cursor is visible (this is usually the case).
@@ -9520,6 +9519,6 @@
   set_specifier_caching (Vtext_cursor_visible_p,
 			 offsetof (struct window, text_cursor_visible_p),
 			 text_cursor_visible_p_changed,
-			 0, 0);
+			 0, 0, 0);
 
 }