# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 731375803 0
# Node ID ffa43acb7de71da0b1c156ddefa7ff4ad6ccca95
# Parent  02792f3b73365eb4d991d7be468240aee3c881a4
(current_column, Fmove_to_column, compute_motion):
Expect display table elts to be vectors.

diff -r 02792f3b7336 -r ffa43acb7de7 src/indent.c
--- a/src/indent.c	Fri Mar 05 23:56:13 1993 +0000
+++ b/src/indent.c	Fri Mar 05 23:56:43 1993 +0000
@@ -137,7 +137,7 @@
 
       c = *--ptr;
       if (c >= 040 && c < 0177
-	  && (dp == 0 || XTYPE (DISP_CHAR_ROPE (dp, c)) != Lisp_String))
+	  && (dp == 0 || XTYPE (DISP_CHAR_VECTOR (dp, c)) != Lisp_Vector))
 	{
 	  col++;
 	}
@@ -154,8 +154,8 @@
 	  col = 0;
 	  tab_seen = 1;
 	}
-      else if (dp != 0 && XTYPE (DISP_CHAR_ROPE (dp, c)) == Lisp_String)
-	col += XSTRING (DISP_CHAR_ROPE (dp, c))->size / sizeof (GLYPH);
+      else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector)
+	col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
       else
 	col += (ctl_arrow && c < 0200) ? 2 : 4;
     }
@@ -329,8 +329,8 @@
 	  col += tab_width;
 	  col = col / tab_width * tab_width;
 	}
-      else if (dp != 0 && XTYPE (DISP_CHAR_ROPE (dp, c)) == Lisp_String)
-	col += XSTRING (DISP_CHAR_ROPE (dp, c))->size / sizeof (GLYPH);
+      else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector)
+	col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
       else if (ctl_arrow && (c < 040 || c == 0177))
         col++;
       else if (c < 040 || c >= 0177)
@@ -434,8 +434,8 @@
 	: !NILP (current_buffer->selective_display) ? -1 : 0;
   int prev_vpos, prev_hpos;
   int selective_rlen
-    = (selective && dp && XTYPE (DISP_INVIS_ROPE (dp)) == Lisp_String
-       ? XSTRING (DISP_INVIS_ROPE (dp))->size / sizeof (GLYPH) : 0);
+    = (selective && dp && XTYPE (DISP_INVIS_VECTOR (dp)) == Lisp_Vector
+       ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
 
   if (tab_width <= 0 || tab_width > 20) tab_width = 8;
   for (pos = from; pos < to; pos++)
@@ -450,7 +450,7 @@
 
       c = FETCH_CHAR (pos);
       if (c >= 040 && c < 0177
-	  && (dp == 0 || XTYPE (DISP_CHAR_ROPE (dp, c)) != Lisp_String))
+	  && (dp == 0 || XTYPE (DISP_CHAR_VECTOR (dp, c)) != Lisp_Vector))
 	hpos++;
       else if (c == '\t')
 	{
@@ -506,8 +506,8 @@
 		hpos = width;
 	    }
 	}
-      else if (dp != 0 && XTYPE (DISP_CHAR_ROPE (dp, c)) == Lisp_String)
-	hpos += XSTRING (DISP_CHAR_ROPE (dp, c))->size / sizeof (GLYPH);
+      else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector)
+	hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
       else
 	hpos += (ctl_arrow && c < 0200) ? 2 : 4;