Port --enable-gcc-warnings to clang.

[gnu-emacs] / src / fontset.h

diff --git a/src/fontset.h b/src/fontset.h
index 661638feb39f1ebbcc18a0c81feb75f1e779688e..926520c80011d39d348d3662f28403754bfb8415 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, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001-2013 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, 2009, 2010
+     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


@@ -27,14 +26,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef EMACS_FONTSET_H
 #define EMACS_FONTSET_H
 
 #ifndef EMACS_FONTSET_H
 #define EMACS_FONTSET_H
 

-/* Check if any window system is used now.  */
-extern void (*check_window_system_func) (void);
-

 struct face;
 
 extern void free_face_fontset (FRAME_PTR, struct face *);
 struct face;
 
 extern void free_face_fontset (FRAME_PTR, struct face *);

-extern Lisp_Object fontset_font_pattern (FRAME_PTR, struct face *, int);
-extern int face_suitable_for_char_p (struct face *, int);

 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 int face_for_char (FRAME_PTR, struct face *, int,
                           int, Lisp_Object);
 extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object);


@@ -42,26 +36,13 @@ extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object);
 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 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);

-EXFUN (Fquery_fontset, 2);

 extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int);
 extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int);

-extern Lisp_Object find_font_encoding (Lisp_Object);

 
 extern Lisp_Object Qlatin;
 
 extern Lisp_Object Qlatin;

-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 Lisp_Object fontset_name (int);
 extern Lisp_Object fontset_ascii (int);
 extern Lisp_Object fontset_name (int);
 extern Lisp_Object fontset_ascii (int);

-extern int fontset_height (int);

 
 struct font;
 extern int face_for_font (struct frame *, Lisp_Object, struct face *);
 
 #endif /* EMACS_FONTSET_H */
 
 struct font;
 extern int face_for_font (struct frame *, Lisp_Object, struct face *);
 
 #endif /* EMACS_FONTSET_H */

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