From: tomo <tomo>
Date: Wed, 7 Jun 2000 09:06:50 +0000 (+0000)
Subject: (ensure_face_cachel_complete): Use `Charset_ID' instead of `unsigned
X-Git-Tag: r21-2-34-tomo-Charset_ID~11
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1692b7c48f03ebd4d885e7deebff66c52b0aa344;p=chise%2Fxemacs-chise.git

(ensure_face_cachel_complete): Use `Charset_ID' instead of `unsigned
char'.
(face_cachel_charset_font_metric_info): Likewise.
(FACE_CACHEL_FONT): Use `MIN_LEADING_BYTE' instead of 128.
---

diff --git a/src/faces.h b/src/faces.h
index cd2d498..9594d97 100644
--- a/src/faces.h
+++ b/src/faces.h
@@ -233,12 +233,12 @@ Lisp_Object ensure_face_cachel_contains_charset (struct face_cachel *cachel,
 						 Lisp_Object charset);
 void ensure_face_cachel_complete (struct face_cachel *cachel,
 				  Lisp_Object domain,
-				  unsigned char *charsets);
+				  Charset_ID *charsets);
 void update_face_cachel_data (struct face_cachel *cachel,
 			      Lisp_Object domain,
 			      Lisp_Object face);
 void face_cachel_charset_font_metric_info (struct face_cachel *cachel,
-					   unsigned char *charsets,
+					   Charset_ID *charsets,
 					   struct font_metric_info *fm);
 void mark_face_cachels (face_cachel_dynarr *elements);
 void mark_face_cachels_as_clean (struct window *w);
@@ -279,7 +279,7 @@ void default_face_height_and_width_1 (Lisp_Object domain,
 				      int *height, int *width);
 
 #define FACE_CACHEL_FONT(cachel, charset) \
-  (cachel->font[XCHARSET_LEADING_BYTE (charset) - 128])
+  (cachel->font[XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE])
 
 #define WINDOW_FACE_CACHEL(window, index) \
   Dynarr_atp ((window)->face_cachels, index)