Use INTERNAL_FIELD for windows.

[gnu-emacs] / src / fontset.h

diff --git a/src/fontset.h b/src/fontset.h
index 8d84a7828d24956b1e494e6d8d6aab668f1efd2d..3eb8d633b6cb276391df31c18f8f65f728c3be1b 100644 (file)
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -1,8 +1,7 @@
 /* Header for fontset handler.
 /* Header for fontset handler.

-   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001-2012  Free Software Foundation, Inc.

    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-     2005, 2006, 2007, 2008
+     2005, 2006, 2007, 2008, 2009, 2010, 2011

      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003, 2006
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003, 2006


@@ -11,10 +10,10 @@
 
 This file is part of GNU Emacs.
 
 
 This file is part of GNU Emacs.
 

-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify

 it under the terms of the GNU General Public License as published by
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.

 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -22,46 +21,31 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef EMACS_FONTSET_H
 #define EMACS_FONTSET_H
 
 /* Check if any window system is used now.  */
 
 #ifndef EMACS_FONTSET_H
 #define EMACS_FONTSET_H
 
 /* Check if any window system is used now.  */

-extern void (*check_window_system_func) P_ ((void));
+extern void (*check_window_system_func) (void);

 
 struct face;
 
 
 struct face;
 

-extern void free_face_fontset P_ ((FRAME_PTR, struct face *));
-extern Lisp_Object fontset_font_pattern P_ ((FRAME_PTR, struct face *, int));
-extern int face_suitable_for_char_p P_ ((struct face *, int));
-extern int face_for_char P_ ((FRAME_PTR, struct face *, int,
-                             int, Lisp_Object));
-extern int make_fontset_for_ascii_face P_ ((FRAME_PTR, int, struct face *));
-extern int fontset_from_font_name P_ ((Lisp_Object));
-extern void set_default_ascii_font P_ ((Lisp_Object));
-extern int fs_query_fontset P_ ((Lisp_Object, int));
-EXFUN (Fquery_fontset, 2);
-extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int));
+extern void free_face_fontset (FRAME_PTR, struct face *);
+extern int face_for_char (FRAME_PTR, struct face *, int,
+                          int, Lisp_Object);
+extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object);

 
 

-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 Vvertical_centering_font_regexp;
-extern Lisp_Object Votf_script_alist;
+extern int make_fontset_for_ascii_face (FRAME_PTR, int, struct face *);
+extern int fontset_from_font (Lisp_Object);
+extern int fs_query_fontset (Lisp_Object, int);
+extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int);

 
 

-extern Lisp_Object fontset_name P_ ((int));
-extern Lisp_Object fontset_ascii P_ ((int));
-extern int fontset_height P_ ((int));
+extern Lisp_Object Qlatin;
+extern Lisp_Object fontset_name (int);
+extern Lisp_Object fontset_ascii (int);

 
 struct font;
 
 struct font;

-extern int face_for_font P_ ((struct frame *, Lisp_Object, struct face *));
-extern int new_fontset_from_font P_ ((Lisp_Object));
+extern int face_for_font (struct frame *, Lisp_Object, struct face *);

 
 #endif /* EMACS_FONTSET_H */
 
 #endif /* EMACS_FONTSET_H */

-
-/* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77
-   (do not change this comment) */