Mercurial > hg > xemacs-beta

diff src/faces.h @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents af57a77cbc92
children e38acbeb1cae
line wrap: on
line diff
--- a/src/faces.h	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/faces.h	Wed Mar 13 08:54:06 2002 +0000
@@ -1,6 +1,6 @@
 /* Face data structures.
    Copyright (C) 1995 Board of Trustees, University of Illinois.
-   Copyright (C) 1995 Ben Wing
+   Copyright (C) 1995, 2002 Ben Wing
 
 This file is part of XEmacs.
 
@@ -24,7 +24,7 @@
 #ifndef INCLUDED_faces_h_
 #define INCLUDED_faces_h_
 
-#include "buffer.h" /* for NUM_LEADING_BYTES */
+#include "charset.h" /* for NUM_LEADING_BYTES */
 
 /* a Lisp_Face is the C object corresponding to a face.  There is one
    of these per face.  It basically contains all of the specifiers for
@@ -156,7 +156,7 @@
 
   Lisp_Object foreground;
   Lisp_Object background;
-  /* There are currently 128 possible charsets under Mule.  For the
+  /* There are currently 128 or 129 possible charsets under Mule.  For the
      moment we just take the easy way out and allocate space for each
      of them.  This avoids messing with Dynarrs.
 
@@ -280,7 +280,7 @@
 				      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)