X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Findent.c;h=e1e4039ff559b29542263bbc233a86743e16e203;hb=4f29597e4f3696a59bb08ffece07183c1568c4a5;hp=8de057ebd829f9053a4f7f6b2537cf69fc92d509;hpb=1e7fd761ecf5fd2208bde8e30fc6f7cbf789b7db;p=chise%2Fxemacs-chise.git-

diff --git a/src/indent.c b/src/indent.c
index 8de057e..e1e4039 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 */
@@ -195,7 +195,7 @@ column_at_point (struct buffer *buf, Bufpos init_pos, int cur_col)
 }
 
 int
-string_column_at_point (struct Lisp_String* s, Bufpos init_pos, int tab_width)
+string_column_at_point (Lisp_String* s, Bufpos init_pos, int tab_width)
 {
   int col;
   int tab_seen;
@@ -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 */