From: tomo <tomo>
Date: Mon, 24 Jul 2000 02:47:34 +0000 (+0000)
Subject: (CHARSET_BY_ATTRIBUTES): New implementation and interface; changed to
X-Git-Tag: r21-2-34-utf-2000-0_17-0~41
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cfd1cac6ba094b6ae9634d1fb36675290ae3f2a;p=chise%2Fxemacs-chise.git-

(CHARSET_BY_ATTRIBUTES): New implementation and interface; changed to
inline function.
---

diff --git a/src/mule-charset.h b/src/mule-charset.h
index 30bc569..6079faf 100644
--- a/src/mule-charset.h
+++ b/src/mule-charset.h
@@ -586,9 +586,14 @@ CHARSET_BY_LEADING_BYTE (int lb)
 
 #endif
 
-#define CHARSET_BY_ATTRIBUTES(type, final, dir) \
-  (chlook->charset_by_attributes[type][final][dir])
-
+INLINE_HEADER Lisp_Object
+CHARSET_BY_ATTRIBUTES (int chars, int multi, int final, int dir);
+INLINE_HEADER Lisp_Object
+CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir)
+{
+  return chlook->charset_by_attributes[(dimension == 1 ? 0 : 2)
+				      + (chars == 94 ? 0 : 1)][final][dir];
+}
 
 /* Table of number of bytes in the string representation of a character
    indexed by the first byte of that representation.