Include "character.h" instead of "charset.h".

(MULTIBYTE_BYTES_WIDTH): Call CHAR_WIDTH instead of
WIDTH_BY_CHAR_HEAD.

diff --git a/src/indent.c b/src/indent.c
index 402456e168518cbb9a786c25b537850d7f62b44e..9f920b66584728814da2f41430a3cdde31988af4 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #include "lisp.h"
 #include "buffer.h"
-#include "charset.h"
+#include "character.h"
 #include "category.h"
 #include "indent.h"
 #include "keyboard.h"
@@ -321,7 +321,7 @@ check_composition (pos, pos_byte, point, len, len_byte, width)
        if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))              \
          width = XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;             \
        else                                                            \
-         width = WIDTH_BY_CHAR_HEAD (*p);                              \
+         width = CHAR_WIDTH (c);                                       \
        if (width > 1)                                                  \
          wide_column = width;                                          \
       }                                                                        \