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

Fix last changes in src/ftfont.c

Browse source 
* src/ftfont.c (ftfont_shape): Add missing argument direction.
(fthbfont_shape) [HAVE_HARFBUZZ]: Remove unused variable ftfont_info.
(fthbfont_driver) [HAVE_HARFBUZZ]: Remove redundant redeclaration.
This commit is contained in:
YAMAMOTO Mitsuharu 2019-05-05 15:55:07 +09:00
parent f208d5ae77
commit 3f9d96e3d7
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ftfont.c
View file

@ -2691,7 +2691,7 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
}
Lisp_Object
ftfont_shape (Lisp_Object lgstring)
ftfont_shape (Lisp_Object lgstring, Lisp_Object direction)
{
struct font *font = CHECK_FONT_GET_OBJECT (LGSTRING_FONT (lgstring));
struct font_info *ftfont_info = (struct font_info *) font;
@ -3019,7 +3019,6 @@ Lisp_Object
fthbfont_shape (Lisp_Object lgstring, Lisp_Object direction)
{
struct font *font = CHECK_FONT_GET_OBJECT (LGSTRING_FONT (lgstring));
struct font_info *ftfont_info = (struct font_info *) font;
return fthbfont_shape_by_hb (lgstring, font, direction);
}
@ -3116,9 +3115,6 @@ static struct font_driver const ftfont_driver =
.filter_properties = ftfont_filter_properties,
.combining_capability = ftfont_combining_capability,
};
#ifdef HAVE_HARFBUZZ
static struct font_driver fthbfont_driver;
#endif /* HAVE_HARFBUZZ */
void
syms_of_ftfont (void)