diff options
| author | Kenichi Handa | 2014-07-05 23:07:57 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2014-07-05 23:07:57 +0900 |
| commit | aeb894a9a06d84d29b93ca04432d7cbed366e665 (patch) | |
| tree | e2b73f9a76bc826c7a443e9a8d4fb3b49bdf7332 /src/nsfont.m | |
| parent | 763a11d0d0dcf543e89a22c98f55ea07c40ceefa (diff) | |
| parent | a984543a4488ed08778eb775d62f7091db117945 (diff) | |
| download | emacs-aeb894a9a06d84d29b93ca04432d7cbed366e665.tar.gz emacs-aeb894a9a06d84d29b93ca04432d7cbed366e665.zip | |
merge trunk
Diffstat (limited to 'src/nsfont.m')
| -rw-r--r-- | src/nsfont.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsfont.m b/src/nsfont.m index 2c5e25b993c..cadc68f9933 100644 --- a/src/nsfont.m +++ b/src/nsfont.m | |||
| @@ -649,7 +649,7 @@ struct font_driver nsfont_driver = | |||
| 649 | nsfont_encode_char, | 649 | nsfont_encode_char, |
| 650 | nsfont_text_extents, | 650 | nsfont_text_extents, |
| 651 | nsfont_draw, | 651 | nsfont_draw, |
| 652 | /* excluded: get_bitmap, free_bitmap, get_outline, free_outline, | 652 | /* excluded: get_bitmap, free_bitmap, |
| 653 | anchor_point, otf_capability, otf_driver, | 653 | anchor_point, otf_capability, otf_driver, |
| 654 | start_for_frame, end_for_frame, shape */ | 654 | start_for_frame, end_for_frame, shape */ |
| 655 | }; | 655 | }; |