Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[gnu-emacs] / src / font.h

diff --git a/src/font.h b/src/font.h
index 24c058dd88bebbcfd07dcef95c14b47b9962c481..3f4ccb106c24ef22a0f9c9de1cc37a4b2d3e1f91 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);
 };