Merge from origin/emacs-25

[gnu-emacs] / src / font.h

diff --git a/src/font.h b/src/font.h
index ba208e3c27da5ef81964ce3d9023d8ede7043227..36fe51ad319da34a5df17c2129587f568ac245d1 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -757,6 +757,12 @@ struct font_driver
   bool (*cached_font_ok) (struct frame *f,
                           Lisp_Object font_object,
                           Lisp_Object entity);
+
+  /* Optional
+
+     Return non-nil if the driver support rendering of combining
+     characters for FONT according to Unicode combining class.  */
+  Lisp_Object (*combining_capability) (struct font *font);
 };