Mercurial > emacs
changeset 97887:cff62eaa08c4
* 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 | 8e29e47e574f |
| children | 4f804087b96e |
| files | src/ChangeLog src/composite.c src/fileio.c src/font.h |
| diffstat | 4 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Aug 30 22:50:35 2008 +0000 +++ b/src/ChangeLog Sun Aug 31 00:56:58 2008 +0000 @@ -1,3 +1,9 @@ +2008-08-31 Stefan Monnier <monnier@iro.umontreal.ca> + + * font.h (font_range): + * fileio.c (report_file_error): + * composite.c (composition_update_it): Yet another int/Lisp_Oject mixup. + 2008-08-30 Glenn Morris <rgm@gnu.org> * frame.c (Fmodify_frame_parameters): Doc fix.
--- 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);
--- a/src/fileio.c Sat Aug 30 22:50:35 2008 +0000 +++ b/src/fileio.c Sun Aug 31 00:56:58 2008 +0000 @@ -269,7 +269,7 @@ str = (char *) SDATA (errstring); c = STRING_CHAR (str, 0); - Faset (errstring, 0, make_number (DOWNCASE (c))); + Faset (errstring, make_number (0), make_number (DOWNCASE (c))); } xsignal (Qfile_error,
--- a/src/font.h Sat Aug 30 22:50:35 2008 +0000 +++ b/src/font.h Sun Aug 31 00:56:58 2008 +0000 @@ -757,9 +757,9 @@ extern Lisp_Object font_update_drivers P_ ((FRAME_PTR f, Lisp_Object list)); extern Lisp_Object font_at P_ ((int c, EMACS_INT pos, struct face *face, struct window *w, Lisp_Object object)); -extern EMACS_INT font_range P_ ((EMACS_INT, EMACS_INT *, - struct window *, struct face *, - Lisp_Object)); +extern Lisp_Object font_range (EMACS_INT, EMACS_INT *, + struct window *, struct face *, + Lisp_Object); extern void font_fill_lglyph_metrics P_ ((Lisp_Object, Lisp_Object)); extern Lisp_Object font_put_extra P_ ((Lisp_Object font, Lisp_Object prop,