projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
indent.c
diff --git
a/src/indent.c
b/src/indent.c
index
8de057e
..
e1e4039
100644
(file)
--- 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
+ displayed_glyphs->end_columns));
#else /* XEmacs */
#ifdef MULE
- col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
+ col += CHAR_COLUMNS (c);
#else
col ++;
#endif /* MULE */
#else
col ++;
#endif /* MULE */
@@
-195,7
+195,7
@@
column_at_point (struct buffer *buf, Bufpos init_pos, int cur_col)
}
int
}
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;
{
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
break;
else
#ifdef MULE
- col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
+ col += CHAR_COLUMNS (c);
#else
col ++;
#endif /* MULE */
#else
col ++;
#endif /* MULE */
@@
-456,7
+456,7
@@
Returns the actual column that it moved to.
+ displayed_glyphs->end_columns));
#else /* XEmacs */
#ifdef MULE
+ displayed_glyphs->end_columns));
#else /* XEmacs */
#ifdef MULE
- col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
+ col += CHAR_COLUMNS (c);
#else
col ++;
#endif /* MULE */
#else
col ++;
#endif /* MULE */