diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-05-05 15:55:07 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-05-05 15:55:07 +0900 |
| commit | 3f9d96e3d70e94768add7d89ffcb94be7de4597e (patch) | |
| tree | f9d6dd3317c85de377a49c475d2c46ef2e7a4e03 /src/ftfont.c | |
| parent | f208d5ae77cf381c6f1db9b1aef76d5e9805a106 (diff) | |
| download | emacs-3f9d96e3d70e94768add7d89ffcb94be7de4597e.tar.gz | |
Fix last changes in src/ftfont.c
* 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.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index f4e0d7d8408..2373af8766a 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -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) |