Mercurial > emacs
diff src/font.h @ 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 | b3102226d335 |
| children | 1dc21862170d |
line wrap: on
line diff
--- 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,