[Emacs-diffs] Changes to emacs/src/fontset.h,v [emacs]

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         emacs
Changes by:     Kenichi Handa <handa>   06/06/06 03:51:27

Index: fontset.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fontset.h,v
retrieving revision 1.26.6.10
retrieving revision 1.26.6.11
diff -u -b -r1.26.6.10 -r1.26.6.11
--- fontset.h   8 Feb 2006 04:24:33 -0000       1.26.6.10
+++ fontset.h   6 Jun 2006 03:51:27 -0000       1.26.6.11
@@ -4,7 +4,7 @@
    Copyright (C) 1995, 1997, 2000
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
-   Copyright (C) 2003
+   Copyright (C) 2003, 2006
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
@@ -243,10 +243,26 @@
       ? (FRAME_X_DISPLAY_INFO ((F))->font_table + (ID))                        
\
       : 0)
 
+#ifdef USE_FONT_BACKEND
+#define FONT_INFO_FROM_FACE(F, FACE)           \
+  (enable_font_backend ? (FACE)->font_info     \
+   : FONT_INFO_FROM_ID ((F), (FACE)->font_info_id))
+#else  /* not USE_FONT_BACKEND */
+#define FONT_INFO_FROM_FACE(F, FACE)   \
+  FONT_INFO_FROM_ID ((F), (FACE)->font_info_id)
+#endif /* not USE_FONT_BACKEND */
+
 extern Lisp_Object fontset_name P_ ((int));
 extern Lisp_Object fontset_ascii P_ ((int));
 extern int fontset_height P_ ((int));
 
+#ifdef USE_FONT_BACKEND
+struct font;
+extern int face_for_font P_ ((struct frame *, struct font *, struct face *));
+extern int new_fontset_from_font P_ ((FRAME_PTR, Lisp_Object));
+extern struct font *fontset_ascii_font P_ ((FRAME_PTR, int));
+#endif /* USE_FONT_BACKEND */
+
 #endif /* EMACS_FONTSET_H */
 
 /* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77