# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1204152547 0
# Node ID ec0a63595f5b9c635fdedb2bc479bcbe14370b0b
# Parent  d86b04f18152d7d3652e02b96c583ab610edbaf9
(current_column, current_column_1, Fmove_to_column)
(compute_motion): Adapt to new glyph code encoding.

diff -r d86b04f18152 -r ec0a63595f5b src/indent.c
--- a/src/indent.c	Wed Feb 27 22:48:58 2008 +0000
+++ b/src/indent.c	Wed Feb 27 22:49:07 2008 +0000
@@ -447,9 +447,9 @@
 		 next_element_from_display_vector does it.  */
 	      Lisp_Object entry = AREF (charvec, i);
 
-	      if (INTEGERP (entry)
-		  && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
-		c = FAST_GLYPH_CHAR (XFASTINT (entry));
+	      if (GLYPH_CODE_P (entry)
+		  && GLYPH_CODE_CHAR_VALID_P (entry))
+		c = GLYPH_CODE_CHAR (entry);
 	      else
 		c = ' ';
 	    }
@@ -583,12 +583,11 @@
 	    {
 	      /* This should be handled the same as
 		 next_element_from_display_vector does it.  */
-	      Lisp_Object entry;
-	      entry = AREF (charvec, i);
+	      Lisp_Object entry = AREF (charvec, i);
 
-	      if (INTEGERP (entry)
-		  && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
-		c = FAST_GLYPH_CHAR (XFASTINT (entry));
+	      if (GLYPH_CODE_P (entry)
+		  && GLYPH_CODE_CHAR_VALID_P (entry))
+		c = GLYPH_CODE_CHAR (entry);
 	      else
 		c = ' ';
 
@@ -1021,13 +1020,11 @@
 	    {
 	      /* This should be handled the same as
 		 next_element_from_display_vector does it.  */
-
-	      Lisp_Object entry;
-	      entry = AREF (charvec, i);
+	      Lisp_Object entry = AREF (charvec, i);
 
-	      if (INTEGERP (entry)
-		  && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
-		c = FAST_GLYPH_CHAR (XFASTINT (entry));
+	      if (GLYPH_CODE_P (entry)
+		  && GLYPH_CODE_CHAR_VALID_P (entry))
+		c = GLYPH_CODE_CHAR (entry);
 	      else
 		c = ' ';
 
@@ -1627,9 +1624,9 @@
 		     next_element_from_display_vector does it.  */
 		  Lisp_Object entry = AREF (charvec, i);
 
-		  if (INTEGERP (entry)
-		      && GLYPH_CHAR_VALID_P (XFASTINT (entry)))
-		    c = FAST_GLYPH_CHAR (XFASTINT (entry));
+		  if (GLYPH_CODE_P (entry)
+		      && GLYPH_CODE_CHAR_VALID_P (entry))
+		    c = GLYPH_CODE_CHAR (entry);
 		  else
 		    c = ' ';
 		}