diff options
| author | Kenichi Handa | 2007-04-25 12:00:13 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2007-04-25 12:00:13 +0000 |
| commit | c927d1df98dfd0ce154d32372ae10577c89f3308 (patch) | |
| tree | fb4a5e8cd2741d6556063439eff55c8a364a33cf /src | |
| parent | b6c8772afcdc9cc50f45e2505bd599fb8de60052 (diff) | |
| download | emacs-c927d1df98dfd0ce154d32372ae10577c89f3308.tar.gz emacs-c927d1df98dfd0ce154d32372ae10577c89f3308.zip | |
(font_open_for_lface): Adjust prototype.
(struct font_driver): Delete members otf_gsub and otf_gpos, add
member otf_drive.
(font_otf_gsub, font_otf_gpos): Delete externs.
(font_drive_otf): Extern it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/font.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/font.h b/src/font.h index ee8d2e27258..4bef1b2f00e 100644 --- a/src/font.h +++ b/src/font.h | |||
| @@ -479,9 +479,9 @@ extern struct font *font_prepare_composition P_ ((struct composition *cmp)); | |||
| 479 | extern Lisp_Object font_otf_capability P_ ((struct font *font)); | 479 | extern Lisp_Object font_otf_capability P_ ((struct font *font)); |
| 480 | /* This can be used as `otf_drive' method of a font-driver. */ | 480 | /* This can be used as `otf_drive' method of a font-driver. */ |
| 481 | extern int font_drive_otf P_ ((struct font *font, Lisp_Object otf_features, | 481 | extern int font_drive_otf P_ ((struct font *font, Lisp_Object otf_features, |
| 482 | Lisp_Object gstring_in, int from, int to, | 482 | Lisp_Object gstring_in, int from, int to, |
| 483 | Lisp_Object gstring_out, int idx, | 483 | Lisp_Object gstring_out, int idx, |
| 484 | int alternate_subst)); | 484 | int alternate_subst)); |
| 485 | #endif /* HAVE_LIBOTF */ | 485 | #endif /* HAVE_LIBOTF */ |
| 486 | 486 | ||
| 487 | #ifdef HAVE_FREETYPE | 487 | #ifdef HAVE_FREETYPE |