ChangeLog fix

[bpt/emacs.git] / src / dispextern.h

diff --git a/src/dispextern.h b/src/dispextern.h
index 8b70985..5396aeb 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1716,8 +1716,10 @@ struct face
      attributes except the font.  */
   struct face *ascii_face;
 
+#ifdef HAVE_XFT
   /* Extra member that a font-driver uses privately.  */
   void *extra;
+#endif  
 };
 
 
@@ -2589,7 +2591,8 @@ struct it
   int vpos;
 
   /* Horizontal matrix position reached in move_it_in_display_line.
-     Only set there, not in display_line.  */
+     Only set there, not in display_line, and only when the X
+     coordinate is past first_visible_x.  */
   int hpos;
 
   /* Left fringe bitmap number (enum fringe_bitmap_type).  */
@@ -3192,7 +3195,6 @@ extern bool help_echo_showing_p;
 extern Lisp_Object help_echo_string, help_echo_window;
 extern Lisp_Object help_echo_object, previous_help_echo_string;
 extern ptrdiff_t help_echo_pos;
-extern int last_tool_bar_item;
 extern void reseat_at_previous_visible_line_start (struct it *);
 extern Lisp_Object lookup_glyphless_char_display (int, struct it *);
 extern ptrdiff_t compute_display_string_pos (struct text_pos *,