Minor tweaks of copying text properties when padding strings

[gnu-emacs] / src / ftfont.h

diff --git a/src/ftfont.h b/src/ftfont.h
index 9053c9ce81defc1c695b10741600436ae15959d9..90abb4529506b97b3c820ce5948d05cafecc00d9 100644 (file)
--- a/src/ftfont.h
+++ b/src/ftfont.h
@@ -1,5 +1,5 @@
 /* ftfont.h -- Interface definition for Freetype font backend.
-   Copyright (C) 2007, 2008, 2009, 2010
+   Copyright (C) 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
@@ -7,8 +7,8 @@ This file is part of GNU Emacs.
 
 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
-the Free Software Foundation, either version 3 of the License, 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
@@ -36,10 +36,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* HAVE_M17N_FLT */
 #endif /* HAVE_LIBOTF */
 
-extern Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object);
 extern FcCharSet *ftfont_get_fc_charset (Lisp_Object);
+extern Lisp_Object ftfont_open2 (struct frame *f,
+                                 Lisp_Object entity,
+                                 int pixel_size,
+                                 Lisp_Object font_object);
+extern size_t ftfont_info_size;
 
 #endif /* EMACS_FTFONT_H */
-
-/* arch-tag: cec13d1c-7156-4997-9ebd-e989040c3d78
-   (do not change this comment) */