Mercurial > emacs
changeset 103011:8f0fbb48af5a
* 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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 17 Apr 2009 18:38:00 +0000 |
| parents | ed58f741d35f |
| children | 387b4a4bbc9b |
| files | src/ChangeLog src/font.c src/font.h src/ftfont.c src/xfont.c |
| diffstat | 5 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 17 02:36:03 2009 +0000 +++ b/src/ChangeLog Fri Apr 17 18:38:00 2009 +0000 @@ -1,3 +1,13 @@ +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
--- a/src/font.c Fri Apr 17 02:36:03 2009 +0000 +++ b/src/font.c Fri Apr 17 18:38:00 2009 +0000 @@ -143,6 +143,9 @@ 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; @@ -5135,6 +5138,9 @@ DEFSYM (Qp, "p"); DEFSYM (Qd, "d"); + DEFSYM (Qja, "ja"); + DEFSYM (Qko, "ko"); + staticpro (&null_vector); null_vector = Fmake_vector (make_number (0), Qnil);
--- a/src/font.h Fri Apr 17 02:36:03 2009 +0000 +++ b/src/font.h Fri Apr 17 18:38:00 2009 +0000 @@ -240,6 +240,9 @@ 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
--- a/src/ftfont.c Fri Apr 17 02:36:03 2009 +0000 +++ b/src/ftfont.c Fri Apr 17 18:38:00 2009 +0000 @@ -43,9 +43,6 @@ /* 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; @@ -2229,8 +2226,6 @@ 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);