* font.h (Qja, Qko): Extern them.
* ftfont.c (Qja, Qko): Remove declarations.
* xfont.c (Qja, Qko): Remove declarations.
+2009-04-17 Chong Yidong <cyd@stupidchicken.com>
+
+ * font.c (Qja, Qko): Move definitions here from ftfont.c.
+
+ * font.h (Qja, Qko): Extern them.
+
+ * ftfont.c (Qja, Qko): Remove declarations.
+
+ * xfont.c (Qja, Qko): Remove declarations.
+
2009-04-17 Kenichi Handa <handa@m17n.org>
* editfns.c (Ftranslate_region_internal): Use Fconcat to make a
Lisp_Object QCantialias, QCfont_entity, QCfc_unknown_spec;
/* Symbols representing values of font spacing property. */
Lisp_Object Qc, Qm, Qp, Qd;
+/* Special ADSTYLE properties to avoid fonts used for Latin
+ characters; used in xfont.c and ftfont.c. */
+Lisp_Object Qja, Qko;
Lisp_Object Vfont_encoding_alist;
DEFSYM (Qp, "p");
DEFSYM (Qd, "d");
+ DEFSYM (Qja, "ja");
+ DEFSYM (Qko, "ko");
+
staticpro (&null_vector);
null_vector = Fmake_vector (make_number (0), Qnil);
extern Lisp_Object Qascii_0;
extern Lisp_Object Qiso8859_1, Qiso10646_1, Qunicode_bmp, Qunicode_sip;
+/* Special ADSTYLE properties to avoid fonts used for Latin characters. */
+extern Lisp_Object Qja, Qko;
+
/* Structure for a font-spec. */
struct font_spec
/* Fontconfig's generic families and their aliases. */
static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif;
-/* Special ADSTYLE properties to avoid fonts used for Latin characters. */
-Lisp_Object Qja, Qko;
-
/* Flag to tell if FcInit is already called or not. */
static int fc_initialized;
DEFSYM (Qmono, "mono");
DEFSYM (Qsans, "sans");
DEFSYM (Qsans__serif, "sans serif");
- DEFSYM (Qja, "ja");
- DEFSYM (Qko, "ko");
staticpro (&freetype_font_cache);
freetype_font_cache = Fcons (Qt, Qnil);
return 0;
}
-extern Lisp_Object Qja, Qko;
-
static int
xfont_has_char (font, c)
Lisp_Object font;