From 1527c36e24fd94435e8e32d67658e340f247c066 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 1 Mar 2002 01:18:09 +0000 Subject: [PATCH] Include "character.h" instead of "charset.h". (CHAR_WIDTH): Moved to character.h. (HASH_KEY, HASH_VALUE): Deleted. --- src/composite.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/composite.c b/src/composite.c index 2ef8533ea6..c9d3432355 100644 --- a/src/composite.c +++ b/src/composite.c @@ -2,6 +2,9 @@ Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. @@ -23,7 +26,7 @@ Boston, MA 02111-1307, USA. */ #include #include "lisp.h" #include "buffer.h" -#include "charset.h" +#include "character.h" #include "intervals.h" /* Emacs uses special text property `composition' to support character @@ -152,18 +155,6 @@ Lisp_Object Qcomposition_function_table; /* Temporary variable used in macros COMPOSITION_XXX. */ Lisp_Object composition_temp; -/* Return how many columns C will occupy on the screen. It always - returns 1 for control characters and 8-bit characters because those - are just ignored in a composition. */ -#define CHAR_WIDTH(c) \ - (SINGLE_BYTE_CHAR_P (c) ? 1 : CHARSET_WIDTH (CHAR_CHARSET (c))) - -/* The following macros for hash table are copied from fns.c. */ -/* Value is the key part of entry IDX in hash table H. */ -#define HASH_KEY(H, IDX) AREF ((H)->key_and_value, 2 * (IDX)) -/* Value is the value part of entry IDX in hash table H. */ -#define HASH_VALUE(H, IDX) AREF ((H)->key_and_value, 2 * (IDX) + 1) - /* Return COMPOSITION-ID of a composition at buffer position CHARPOS/BYTEPOS and length NCHARS. The `composition' property of the sequence is PROP. STRING, if non-nil, is a string that -- 2.20.1