Mercurial > emacs

diff src/composite.c @ 97887:cff62eaa08c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* font.h (font_range): * fileio.c (report_file_error): * composite.c (composition_update_it): Yet another int/Lisp_Oject mixup.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 31 Aug 2008 00:56:58 +0000
parents a361f652d863
children 59bcf1726f2c
line wrap: on
line diff
--- a/src/composite.c	Sat Aug 30 22:50:35 2008 +0000
+++ b/src/composite.c	Sun Aug 31 00:56:58 2008 +0000
@@ -1142,7 +1142,7 @@
 	  Lisp_Object glyph = LGSTRING_GLYPH (gstring, cmp_it->from);
 	  int from = LGLYPH_FROM (glyph);
 
-	  c = LGSTRING_CHAR (gstring, from);
+	  c = XINT (LGSTRING_CHAR (gstring, from));
 	  cmp_it->nchars = LGLYPH_TO (glyph) - from + 1;
 	  cmp_it->width = (LGLYPH_WIDTH (glyph) > 0
 			   ? CHAR_WIDTH (LGLYPH_CHAR (glyph)) : 0);