diff src/dispextern.h @ 111945:c00190a8c8ef

Merge from emacs-23

--- a/src/dispextern.h	Mon Dec 13 04:22:39 2010 +0000
+++ b/src/dispextern.h	Mon Dec 13 10:27:36 2010 -0500
@@ -2178,6 +2178,12 @@
      OVERLAY_STRING_CHUNK_SIZE.  */
   int n_overlay_strings;
 
+  /* The charpos where n_overlay_strings was calculated.  This should
+     be set at the same time as n_overlay_strings.  It is needed
+     because we show before-strings at the start of invisible text;
+     see handle_invisible_prop in xdisp.c.  */
+  int overlay_strings_charpos;
+
   /* Vector of overlays to process.  Overlay strings are processed
      OVERLAY_STRING_CHUNK_SIZE at a time.  */
 #define OVERLAY_STRING_CHUNK_SIZE 16