diff options
| author | Stefan Monnier | 2019-07-09 16:13:25 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2019-07-09 16:13:25 -0400 |
| commit | 3078e6d2fb9b2acf785be11de465f6410acaa5fc (patch) | |
| tree | b64e4e1d395652888af94a38660654711f3e7e03 /src/macfont.m | |
| parent | 2391a8e24f2ea1f80661ed29fcc64c02c7d8d95c (diff) | |
| parent | 412139f1be7415791a0d964f95f319c86eded426 (diff) | |
| download | emacs-3078e6d2fb9b2acf785be11de465f6410acaa5fc.tar.gz emacs-3078e6d2fb9b2acf785be11de465f6410acaa5fc.zip | |
Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs into trunk
Diffstat (limited to 'src/macfont.m')
| -rw-r--r-- | src/macfont.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macfont.m b/src/macfont.m index 2b7f963fd61..301951f34a5 100644 --- a/src/macfont.m +++ b/src/macfont.m | |||
| @@ -1663,8 +1663,8 @@ static struct font_driver macfont_driver = | |||
| 1663 | .match = macfont_match, | 1663 | .match = macfont_match, |
| 1664 | .list_family = macfont_list_family, | 1664 | .list_family = macfont_list_family, |
| 1665 | .free_entity = macfont_free_entity, | 1665 | .free_entity = macfont_free_entity, |
| 1666 | .open = macfont_open, | 1666 | .open_font = macfont_open, |
| 1667 | .close = macfont_close, | 1667 | .close_font = macfont_close, |
| 1668 | .has_char = macfont_has_char, | 1668 | .has_char = macfont_has_char, |
| 1669 | .encode_char = macfont_encode_char, | 1669 | .encode_char = macfont_encode_char, |
| 1670 | .text_extents = macfont_text_extents, | 1670 | .text_extents = macfont_text_extents, |