procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* font.h (font_range):

Browse source 
* fileio.c (report_file_error):
* composite.c (composition_update_it): Yet another int/Lisp_Oject mixup.
This commit is contained in:
Stefan Monnier 2008-08-31 00:56:58 +00:00
parent a02a138445
commit c7c7a80c12
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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.

2
src/composite.c
View file

@ -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);

2
src/fileio.c
View file

@ -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,

6
src/font.h
View file

@ -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,