From 42926ec8785db4d6363c54a0859ece09d710cbd0 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Mon, 4 Mar 2013 11:41:01 +0400 Subject: [PATCH] * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW. * ftfont.c (ftfont_shape_by_flt): Likewise. * w32uniscribe.c (uniscribe_shape): Likewise. --- src/ChangeLog | 7 +++++++ src/font.c | 2 +- src/ftfont.c | 2 +- src/w32uniscribe.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index adff00f7189..2d6ddb9b06a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-03-04 Dmitry Antipov + + * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW. + * ftfont.c (ftfont_shape_by_flt): Likewise. + * w32uniscribe.c (uniscribe_shape): Likewise. + 2013-03-02 Paul Eggert The lock for FILE is now .#FILE or .#-FILE (Bug#13807). @@ -208,6 +214,7 @@ of dumping Emacs. Explain why. 2013-02-20 Dmitry Antipov + * search.c (find_newline): Return byte position in bytepos. Adjust comment. (find_next_newline_no_quit, find_before_next_newline): diff --git a/src/font.c b/src/font.c index e2ea7262397..c6707cf31a8 100644 --- a/src/font.c +++ b/src/font.c @@ -4716,7 +4716,7 @@ the corresponding element is nil. */) code = font->driver->encode_char (font, c); if (code == FONT_INVALID_CODE) continue; - g = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); + g = LGLYPH_NEW (); LGLYPH_SET_FROM (g, i); LGLYPH_SET_TO (g, i); LGLYPH_SET_CHAR (g, c); diff --git a/src/ftfont.c b/src/ftfont.c index 1fb1b574a1c..867e25a7a25 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -2541,7 +2541,7 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font, if (NILP (lglyph)) { - lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); + lglyph = LGLYPH_NEW (); LGSTRING_SET_GLYPH (lgstring, i, lglyph); } LGLYPH_SET_FROM (lglyph, g->from); diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index 56931adfac5..c153c8f3565 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -333,7 +333,7 @@ uniscribe_shape (Lisp_Object lgstring) if (NILP (lglyph)) { - lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); + lglyph = LGLYPH_NEW (); LGSTRING_SET_GLYPH (lgstring, lglyph_index, lglyph); } /* Copy to a 32-bit data type to shut up the -- 2.39.2