+ displayed_glyphs->end_columns));
#else /* XEmacs */
#ifdef MULE
- col += CHAR_COLUMNS (c);
+ col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
#else
col ++;
#endif /* MULE */
break;
else
#ifdef MULE
- col += CHAR_COLUMNS (c);
+ col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
#else
col ++;
#endif /* MULE */
+ displayed_glyphs->end_columns));
#else /* XEmacs */
#ifdef MULE
- col += CHAR_COLUMNS (c);
+ col += XCHARSET_COLUMNS (CHAR_CHARSET (c));
#else
col ++;
#endif /* MULE */