* font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW.

* ftfont.c (ftfont_shape_by_flt): Likewise.
* w32uniscribe.c (uniscribe_shape): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index adff00f7189ac008638e52537de11e79c4008c1f..2d6ddb9b06ae3b59c669608198199bc3b8533cff 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-04  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * 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  <eggert@cs.ucla.edu>
 
        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  <dmantipov@yandex.ru>
+
        * 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 e2ea726239741b1b490e98460a4b8165f27a0217..c6707cf31a847da72038cfa0672103c95605719d 100644 (file)
--- 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 1fb1b574a1c144810b08238bde70704be7ef1140..867e25a7a25f02b35d8aa27ce15194d983a19c5a 100644 (file)
--- 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 56931adfac5222fbc01af3356f3c43d2246f0014..c153c8f35653c99dcfb453ab6837785f7cdea27c 100644 (file)
--- 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