diff options
| author | Kenichi Handa <handa@m17n.org> | 2008-05-19 07:23:52 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2008-05-19 07:23:52 +0000 |
| commit | 25b81df40e3cc17f2468bedd89a697744c3f837e (patch) | |
| tree | 648fc4d949a9354d069e62408dc1c062a25968cd /src | |
| parent | 7cee5d639b76e3bb27d3791f92d08bd62192b46b (diff) | |
| download | emacs-25b81df40e3cc17f2468bedd89a697744c3f837e.tar.gz emacs-25b81df40e3cc17f2468bedd89a697744c3f837e.tar.bz2 emacs-25b81df40e3cc17f2468bedd89a697744c3f837e.zip | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 22 | ||||
| -rw-r--r-- | src/font.h | 2 |
2 files changed, 23 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9c0e58bdacf..0a04daf0c5b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,25 @@ +2008-05-19 Kenichi Handa <handa@m17n.org> + + * font.c (font_list_entities): Fix handling of cache. + (font_matching_entity): Likewise. + + * ftfont.c (cs_iso8859_1): Deleted. + (ft_face_cache): New variable. + (struct ftfont_info): New member fc_charset_idx; + (ftfont_build_basic_charsets): Deleted. + (fc_charset_table): New variable. + (ftfont_pattern_entity): New arg fc_charset_idx. Store (FILENAME + . FC_CHARSET_IDX) as :font-entity property in the font entity. + Callers changed. + (ftfont_lookup_cache, ftfont_get_charset): New funcitons. + (ftfont_spec_pattern): New argument fc_charset_idx. Check + registry more rigidly. Callers changed. + (ftfont_open, ftfont_close, ftfont_has_char): Adjustd for the + change of :font-entity property of the font. + + * xftfont.c (xftfont_open): Ajusted for the change of :font-entity + property of the font. + 2008-05-18 Juanma Barranquero <lekktu@gmail.com> * coding.c (Fcoding_system_p): Rename argument to match docstring. diff --git a/src/font.h b/src/font.h index 3c5645b31eb..e66b5fd90de 100644 --- a/src/font.h +++ b/src/font.h @@ -179,7 +179,7 @@ enum font_property_index is not available. */ FONT_FILE_INDEX, - /* Format of the font (symbol). */ + /* Format of the font (symbol) or nil if unknown. */ FONT_FORMAT_INDEX, /* This value is the length of font-object vector. */ |