From e0dca7e74f4180d646721d8545e1de6f8a2f97df Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Fri, 10 Sep 1999 08:35:11 +0000
Subject: [PATCH] (column_at_point): Use `CHAR_COLUMNS' instead of
 `XCHARSET_COLUMNS' and `CHAR_CHARSET'.
 (string_column_at_point): Likewise. (Fmove_to_column):
 Likewise.

---
 src/indent.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/indent.c b/src/indent.c
index 8de057e..f72f020 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -169,7 +169,7 @@ column_at_point (struct buffer *buf, Bufpos init_pos, int cur_col)
 		     + displayed_glyphs->end_columns));
 #else /* XEmacs */
 #ifdef MULE
-	  col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
+	  col += CHAR_COLUMNS (c);
 #else
 	  col ++;
 #endif /* MULE */
@@ -226,7 +226,7 @@ string_column_at_point (struct Lisp_String* s, Bufpos init_pos, int tab_width)
 	break;
       else
 #ifdef MULE
-	  col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
+	  col += CHAR_COLUMNS (c);
 #else
 	  col ++;
 #endif /* MULE */
@@ -456,7 +456,7 @@ Returns the actual column that it moved to.
 		     + displayed_glyphs->end_columns));
 #else /* XEmacs */
 #ifdef MULE
-	  col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
+	  col += CHAR_COLUMNS (c);
 #else
 	  col ++;
 #endif /* MULE */
-- 
1.7.10.4