diff options
| author | Stefan Monnier <[email protected]> | 2008-08-31 00:56:58 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2008-08-31 00:56:58 +0000 |
| commit | c7c7a80c12c4c4cc79c69c77aa351df0c0b37943 (patch) | |
| tree | e6908c2b7614a1ca80e1f8b942ec0993b9350fb3 | |
| parent | a02a1384456048203df5989be6280e0974747152 (diff) | |
* font.h (font_range):
* fileio.c (report_file_error):
* composite.c (composition_update_it): Yet another int/Lisp_Oject mixup.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/composite.c | 2 | ||||
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/font.h | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8466ab7ba9..22ffbcf3ce 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-08-31 Stefan Monnier <[email protected]> + + * 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 <[email protected]> * frame.c (Fmodify_frame_parameters): Doc fix. diff --git a/src/composite.c b/src/composite.c index d535e1e73c..257ca66632 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1142,7 +1142,7 @@ composition_update_it (cmp_it, charpos, bytepos, string) 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); diff --git a/src/fileio.c b/src/fileio.c index bf592fa7c4..02c41243cb 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -269,7 +269,7 @@ report_file_error (string, data) 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, diff --git a/src/font.h b/src/font.h index 0235463e54..12781d9538 100644 --- a/src/font.h +++ b/src/font.h @@ -757,9 +757,9 @@ extern void free_font_driver_list P_ ((FRAME_PTR f)); 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, |