(tty_output_display_block): Use `CHAR_COLUMNS' instead of

`XCHARSET_COLUMNS' and `CHAR_CHARSET'.

diff --git a/src/redisplay-tty.c b/src/redisplay-tty.c
index 08899fa..0f051fb 100644 (file)
--- a/src/redisplay-tty.c
+++ b/src/redisplay-tty.c
@@ -357,7 +357,7 @@ tty_output_display_block (struct window *w, struct display_line *dl, int block,
                          {
 #ifdef MULE
                            Emchar ch = charptr_emchar (temptemp);
-                           i += XCHARSET_COLUMNS (CHAR_CHARSET (ch));
+                           i += CHAR_COLUMNS (ch);
 #else
                            i++; /* telescope this */
 #endif