diff options
| author | Kenichi Handa <handa@m17n.org> | 2009-06-23 05:53:56 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2009-06-23 05:53:56 +0000 |
| commit | 74d754240555c3cbe51ec536eda17a2d72add7dd (patch) | |
| tree | db60f28118a2697f27e752777df1e5ec80f1fdcf /src | |
| parent | 59314cafbe202368be807a23bffff16283df05aa (diff) | |
| download | emacs-74d754240555c3cbe51ec536eda17a2d72add7dd.tar.gz | |
(main): Call init_font ().
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 14 | ||||
| -rw-r--r-- | src/emacs.c | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ccef6a0f450..a0f2650445a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,19 @@ 2009-06-23 Kenichi Handa <handa@m17n.org> + * emacs.c (main): Call init_font (). + + * font.h (Vfont_log): Extern it. + (FONT_ADD_LOG, FONT_DEFERRED_LOG): New macros. + + * font.c (font_sort_entities, font_list_entities) + (font_matching_entity, font_open_entity) + (font_close_object): Change font_add_log to FONT_ADD_LOG. + (Vfont_log): Delete static. + (font_log_env_checked): Delete this variable. + (font_add_log): Don't check font_log_env_checked. + (font_deferred_log): Check Vfont_log. + (init_font): New function. + * ftfont.c: Change font_add_log to FONT_ADD_LOG. * w32font.c: Change font_add_log to FONT_ADD_LOG. diff --git a/src/emacs.c b/src/emacs.c index 3e94f0fc6c1..e6af0974c2a 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1772,6 +1772,7 @@ main (int argc, char **argv) init_sound (); #endif init_window (); + init_font (); if (!initialized) { |