diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-03-23 09:46:39 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-03-23 09:46:39 -0700 |
| commit | d5cfc4ac8bd25ec43864af4b8d10fff643fb47bd (patch) | |
| tree | 2cdc6a7d87cebbfd788f985f05f7d92ed711e5f5 /src | |
| parent | 8f694831c04b1fb9db81be72afdc1a1101d619c4 (diff) | |
| parent | bed04c502caa8cf0365a0808adb70451b3d8761a (diff) | |
Merge from origin/emacs-27
bed04c502c Use correct registry name for windows-1251 charset
1aa1529301 ERC: Update maintainer address
Diffstat (limited to 'src')
| -rw-r--r-- | src/ftfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 2b442ead4bf..6b549c3ddf2 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -119,7 +119,7 @@ static struct { "jisx0213.2004-1", { 0x20B9F }}, { "viscii1.1-1", { 0x1EA0, 0x1EAE, 0x1ED2 }, "vi"}, { "tis620.2529-1", { 0x0E01 }, "th"}, - { "windows-1251", { 0x0401, 0x0490 }, "ru"}, + { "microsoft-cp1251", { 0x0401, 0x0490 }, "ru"}, { "koi8-r", { 0x0401, 0x2219 }, "ru"}, { "mulelao-1", { 0x0E81 }, "lo"}, { "unicode-sip", { 0x20000 }}, |