Merged in changes from CVS trunk.

[bpt/emacs.git] / src / fontset.h

diff --git a/src/fontset.h b/src/fontset.h
index 4fd1076..36367be 100644 (file)
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -43,6 +43,11 @@ struct font_info
   /* Charset of characters displayed by the font.  */
   int charset;
 
+#ifdef WINDOWSNT
+  /* Codepage of characters that will be displayed by the font.  */
+  int codepage;
+#endif
+
   /* Maximum bound width over all existing characters of the font.  On
      X window, this is same as (font->max_bounds.width) */
   int size;
@@ -92,7 +97,7 @@ struct font_info
      `ascent'.  In other words, the value indicates how many bits
      higher we should draw a character of the font than normal ASCII
      text for a better looking.
-       
+
      We also have to consider the fact that the concept of `baseline'
      differs among languages to which each character belongs.  For
      instance, baseline should be at the bottom most position of all
@@ -178,7 +183,7 @@ extern void (*check_window_system_func) P_ ((void));
 
 struct face;
 
-extern void fs_free_face_fontset P_ ((FRAME_PTR, struct face *));
+extern void free_face_fontset P_ ((FRAME_PTR, struct face *));
 extern Lisp_Object fontset_font_pattern P_ ((FRAME_PTR, int, int));
 extern int face_suitable_for_char_p P_ ((struct face *, int));
 extern int face_for_char P_ ((FRAME_PTR, struct face *, int));
@@ -190,12 +195,10 @@ EXFUN (Fquery_fontset, 2);
 extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int));
 
 extern Lisp_Object Qfontset;
-extern Lisp_Object Vuse_default_ascent; 
+extern Lisp_Object Vuse_default_ascent;
 extern Lisp_Object Vignore_relative_composition;
 extern Lisp_Object Valternate_fontname_alist;
 extern Lisp_Object Vfontset_alias_alist;
-extern Lisp_Object Vhighlight_wrong_size_font;
-extern Lisp_Object Vclip_large_size_font;
 extern Lisp_Object Vvertical_centering_font_regexp;
 
 /* Load a font named FONTNAME for displaying character C.  All fonts
@@ -233,3 +236,6 @@ extern Lisp_Object fontset_ascii P_ ((int));
 extern int fontset_height P_ ((int));
 
 #endif /* EMACS_FONTSET_H */
+
+/* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77
+   (do not change this comment) */