diff options
| author | Stefan Monnier | 2008-07-09 13:24:10 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-07-09 13:24:10 +0000 |
| commit | 3cba9369dcbfb18042620a28fa80b7319b248e5f (patch) | |
| tree | 49ab4260914cb189f5cf9c7f3f3e8e5463768fc8 /src | |
| parent | 0e17387a9e94f2e1974fa857dc8808bbea66c523 (diff) | |
| download | emacs-3cba9369dcbfb18042620a28fa80b7319b248e5f.tar.gz emacs-3cba9369dcbfb18042620a28fa80b7319b248e5f.zip | |
* fontset.c (fontset_get_font_group):
* font.c (font_check_otf): Specify argument types.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/font.c | 2 | ||||
| -rw-r--r-- | src/fontset.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a03f3547843..8470c1ffcfb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-07-09 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * fontset.c (fontset_get_font_group): | ||
| 4 | * font.c (font_check_otf): Specify argument types. | ||
| 5 | |||
| 1 | 2008-07-09 Kenichi Handa <handa@m17n.org> | 6 | 2008-07-09 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * coding.c (detect_coding_utf_8): Set detect_info->found only when | 8 | * coding.c (detect_coding_utf_8): Set detect_info->found only when |
diff --git a/src/font.c b/src/font.c index 8988b2193bd..91bb84239ae 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -2404,7 +2404,7 @@ font_check_otf_features (script, langsys, features, table) | |||
| 2404 | /* Check if OTF_CAPABILITY satisfies SPEC (otf-spec). */ | 2404 | /* Check if OTF_CAPABILITY satisfies SPEC (otf-spec). */ |
| 2405 | 2405 | ||
| 2406 | static int | 2406 | static int |
| 2407 | font_check_otf (spec, otf_capability) | 2407 | font_check_otf (Lisp_Object spec, Lisp_Object otf_capability) |
| 2408 | { | 2408 | { |
| 2409 | Lisp_Object script, langsys = Qnil, gsub = Qnil, gpos = Qnil; | 2409 | Lisp_Object script, langsys = Qnil, gsub = Qnil, gpos = Qnil; |
| 2410 | 2410 | ||
diff --git a/src/fontset.c b/src/fontset.c index 5dbbadbe042..caa732b6bc6 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -459,7 +459,7 @@ reorder_font_vector (font_group, font) | |||
| 459 | } | 459 | } |
| 460 | 460 | ||
| 461 | static Lisp_Object | 461 | static Lisp_Object |
| 462 | fontset_get_font_group (fontset, c) | 462 | fontset_get_font_group (Lisp_Object fontset, int c) |
| 463 | { | 463 | { |
| 464 | Lisp_Object font_group; | 464 | Lisp_Object font_group; |
| 465 | Lisp_Object base_fontset; | 465 | Lisp_Object base_fontset; |