diff options
| author | Glenn Morris | 2020-03-18 07:50:36 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-03-18 07:50:36 -0700 |
| commit | 45630d02527e44de3153d09c8590d3f796c5dada (patch) | |
| tree | b2c05fe2347a78e42dd4a5cf2380af833fb0105e /src/macfont.m | |
| parent | 299744e083342e43deece03bc0691feb190ccc54 (diff) | |
| parent | 3a8a231810d3380889bda5034f4d9e995d82b0b7 (diff) | |
| download | emacs-45630d02527e44de3153d09c8590d3f796c5dada.tar.gz emacs-45630d02527e44de3153d09c8590d3f796c5dada.zip | |
Merge from origin/emacs-27
3a8a231810 * lisp/textmodes/fill.el (fill-nobreak-predicate): Fix doc...
cbe643104d Improve Package Menu hiding docstrings
8d28c98ae0 Fix display of Big5 characters when using Fontconfig
Diffstat (limited to 'src/macfont.m')
| -rw-r--r-- | src/macfont.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macfont.m b/src/macfont.m index 442a2566037..21bc7dde5b3 100644 --- a/src/macfont.m +++ b/src/macfont.m | |||
| @@ -664,7 +664,7 @@ static struct | |||
| 664 | { "iso8859-15", { 0x00A0, 0x00A1, 0x00D0, 0x0152 }}, | 664 | { "iso8859-15", { 0x00A0, 0x00A1, 0x00D0, 0x0152 }}, |
| 665 | { "iso8859-16", { 0x00A0, 0x0218}}, | 665 | { "iso8859-16", { 0x00A0, 0x0218}}, |
| 666 | { "gb2312.1980-0", { 0x4E13 }, CFSTR ("zh-Hans")}, | 666 | { "gb2312.1980-0", { 0x4E13 }, CFSTR ("zh-Hans")}, |
| 667 | { "big5-0", { /* 0xF6B1 in ftfont.c */ 0x4EDC }, CFSTR ("zh-Hant") }, | 667 | { "big5-0", { /* 0x9C21 in ftfont.c */ 0x4EDC }, CFSTR ("zh-Hant") }, |
| 668 | { "jisx0208.1983-0", { 0x4E55 }, CFSTR ("ja")}, | 668 | { "jisx0208.1983-0", { 0x4E55 }, CFSTR ("ja")}, |
| 669 | { "ksc5601.1987-0", { 0xAC00 }, CFSTR ("ko")}, | 669 | { "ksc5601.1987-0", { 0xAC00 }, CFSTR ("ko")}, |
| 670 | { "cns11643.1992-1", { 0xFE32 }, CFSTR ("zh-Hant")}, | 670 | { "cns11643.1992-1", { 0xFE32 }, CFSTR ("zh-Hant")}, |