(font_open_for_lface): Adjust prototype.

(struct font_driver): Delete members otf_gsub and otf_gpos, add
member otf_drive.
(font_otf_gsub, font_otf_gpos): Delete externs.
(font_drive_otf): Extern it.

diff --git a/src/font.h b/src/font.h
index ee8d2e272583e4c22bf6ba7767875263246aa7da..4bef1b2f00e5187db710462eecba1447f315e3a6 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -479,9 +479,9 @@ extern struct font *font_prepare_composition P_ ((struct composition *cmp));
 extern Lisp_Object font_otf_capability P_ ((struct font *font));
 /* This can be used as `otf_drive' method of a font-driver.  */
 extern int font_drive_otf P_ ((struct font *font, Lisp_Object otf_features,
-                             Lisp_Object gstring_in, int from, int to,
-                             Lisp_Object gstring_out, int idx,
-                             int alternate_subst));
+                              Lisp_Object gstring_in, int from, int to,
+                              Lisp_Object gstring_out, int idx,
+                              int alternate_subst));
 #endif /* HAVE_LIBOTF */
 
 #ifdef HAVE_FREETYPE