From: tomo <tomo>
Date: Fri, 10 Sep 1999 08:35:11 +0000 (+0000)
Subject: (column_at_point): Use `CHAR_COLUMNS' instead of `XCHARSET_COLUMNS'
X-Git-Tag: r21-2-19-utf-2000-0_7-0~59
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=e0dca7e74f4180d646721d8545e1de6f8a2f97df;p=chise%2Fxemacs-chise.git

(column_at_point): Use `CHAR_COLUMNS' instead of `XCHARSET_COLUMNS'
and `CHAR_CHARSET'.
(string_column_at_point): Likewise.
(Fmove_to_column): Likewise.
---

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 */