aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2013-03-04 11:41:01 +0400
committerDmitry Antipov2013-03-04 11:41:01 +0400
commit42926ec8785db4d6363c54a0859ece09d710cbd0 (patch)
tree1df4bf572aca4e094683036de7b5788772265f4a /src
parent39004030f6f36b1042ad1eaae10b9556bc6e04d5 (diff)
downloademacs-42926ec8785db4d6363c54a0859ece09d710cbd0.tar.gz
emacs-42926ec8785db4d6363c54a0859ece09d710cbd0.zip
* font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW.
* ftfont.c (ftfont_shape_by_flt): Likewise. * w32uniscribe.c (uniscribe_shape): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/font.c2
-rw-r--r--src/ftfont.c2
-rw-r--r--src/w32uniscribe.c2
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 @@
12013-03-04 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW.
4 * ftfont.c (ftfont_shape_by_flt): Likewise.
5 * w32uniscribe.c (uniscribe_shape): Likewise.
6
12013-03-02 Paul Eggert <eggert@cs.ucla.edu> 72013-03-02 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 The lock for FILE is now .#FILE or .#-FILE (Bug#13807). 9 The lock for FILE is now .#FILE or .#-FILE (Bug#13807).
@@ -208,6 +214,7 @@
208 of dumping Emacs. Explain why. 214 of dumping Emacs. Explain why.
209 215
2102013-02-20 Dmitry Antipov <dmantipov@yandex.ru> 2162013-02-20 Dmitry Antipov <dmantipov@yandex.ru>
217
211 * search.c (find_newline): Return byte position in bytepos. 218 * search.c (find_newline): Return byte position in bytepos.
212 Adjust comment. 219 Adjust comment.
213 (find_next_newline_no_quit, find_before_next_newline): 220 (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. */)
4716 code = font->driver->encode_char (font, c); 4716 code = font->driver->encode_char (font, c);
4717 if (code == FONT_INVALID_CODE) 4717 if (code == FONT_INVALID_CODE)
4718 continue; 4718 continue;
4719 g = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); 4719 g = LGLYPH_NEW ();
4720 LGLYPH_SET_FROM (g, i); 4720 LGLYPH_SET_FROM (g, i);
4721 LGLYPH_SET_TO (g, i); 4721 LGLYPH_SET_TO (g, i);
4722 LGLYPH_SET_CHAR (g, c); 4722 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,
2541 2541
2542 if (NILP (lglyph)) 2542 if (NILP (lglyph))
2543 { 2543 {
2544 lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); 2544 lglyph = LGLYPH_NEW ();
2545 LGSTRING_SET_GLYPH (lgstring, i, lglyph); 2545 LGSTRING_SET_GLYPH (lgstring, i, lglyph);
2546 } 2546 }
2547 LGLYPH_SET_FROM (lglyph, g->from); 2547 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)
333 333
334 if (NILP (lglyph)) 334 if (NILP (lglyph))
335 { 335 {
336 lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); 336 lglyph = LGLYPH_NEW ();
337 LGSTRING_SET_GLYPH (lgstring, lglyph_index, lglyph); 337 LGSTRING_SET_GLYPH (lgstring, lglyph_index, lglyph);
338 } 338 }
339 /* Copy to a 32-bit data type to shut up the 339 /* Copy to a 32-bit data type to shut up the