From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 21 Jan 1997 05:38:46 +0000 (+0000)
Subject: (FAST_MAKE_GLYPH): Rename args to CHAR and FACE.
X-Git-Tag: emacs-20.1~3031
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f084eb91d530b5613c27092c8d2d3fb24260d569;p=emacs.git

(FAST_MAKE_GLYPH): Rename args to CHAR and FACE.
Cast CHAR to unsigned char before using it.
---

diff --git a/src/lisp.h b/src/lisp.h
index f478539f2cb..e6a7e6ed04f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -877,7 +877,7 @@ typedef unsigned char UCHAR;
 /* The FAST macros assume that we already know we're in an X window.  */
 
 /* Given a character code and a face ID, return the appropriate glyph.  */
-#define FAST_MAKE_GLYPH(char, face) ((char) | ((face) << 8))
+#define FAST_MAKE_GLYPH(CHAR, FACE) ((unsigned char) (CHAR) | ((FACE) << 8))
 
 /* Return a glyph's character code.  */
 #define FAST_GLYPH_CHAR(glyph) ((glyph) & 0xff)