(enum fringe_bitmap_type): Define here.

[bpt/emacs.git] / src / indent.c

diff --git a/src/indent.c b/src/indent.c
index ae1f688..22039eb 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -667,7 +667,7 @@ string_display_width (string, beg, end)
   int b, e;
 
   if (NILP (end))
-    e = XSTRING (string)->size;
+    e = SCHARS (string);
   else
     {
       CHECK_NUMBER (end);
@@ -683,10 +683,10 @@ string_display_width (string, beg, end)
     }
 
   /* Make a pointer for decrementing through the chars before point.  */
-  ptr = XSTRING (string)->data + e;
+  ptr = SDATA (string) + e;
   /* Make a pointer to where consecutive chars leave off,
      going backwards from point.  */
-  stop = XSTRING (string)->data + b;
+  stop = SDATA (string) + b;
 
   if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
 
@@ -2023,11 +2023,12 @@ whether or not it is currently displayed in some window.  */)
   SET_TEXT_POS (pt, PT, PT_BYTE);
   start_display (&it, w, pt);
 
-  /* Move to the start of the line containing PT.  If we don't do
-     this, we start moving with IT->current_x == 0, while PT is really
-     at some x > 0.  The effect is, in continuation lines, that we end
-     up with the iterator placed at where it thinks X is 0, while the
-     end position is really at some X > 0, the same X that PT had.  */
+  /* Move to the start of the display line containing PT.  If we don't
+     do this, we start moving with IT->current_x == 0, while PT is
+     really at some x > 0.  The effect is, in continuation lines, that
+     we end up with the iterator placed at where it thinks X is 0,
+     while the end position is really at some X > 0, the same X that
+     PT had.  */
   move_it_by_lines (&it, 0, 0);
 
   if (XINT (lines) != 0)