From: Kenichi Handa <handa@m17n.org>
Date: Fri, 1 Mar 2002 01:42:20 +0000 (+0000)
Subject: Include "character.h" instead of "charset.h".
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~1004
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6ed712f0a15dccac87d306f0c38aeb57e48ea0f;p=emacs.git

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 402456e1685..9f920b66584 100644
--- 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;						\
       }									\