diff options
author | Eli Zaretskii <eliz@gnu.org> | 2021-02-07 17:52:30 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2021-02-07 17:52:30 +0200 |
commit | abedf3a8653829f5170ff72b2fc7adad0e6f80d4 (patch) | |
tree | f45210093b04d7612eaf0b00b35b149abb2c8bdd /lisp | |
parent | 8b8708eadd94fcdad4c426a20370ff4ab13df258 (diff) | |
download | emacs-abedf3a8653829f5170ff72b2fc7adad0e6f80d4.tar.gz |
Fix language-environment and font selection on MS-Windows
These changes improve setting the language-environment and font
selection when MS-Windows returns useless "ZZZ" as the "language
name", which then disrupts all the setup of the locale-dependent
stuff, and in particular font selection.
* lisp/w32-fns.el (w32-charset-info-alist): Add an element for
"iso8859-5", in case LANG is set to something unusable, like
"ZZZ". This allows fonts capable of displaying Cyrillic
characters to be used even when language preferences are screwed.
* src/w32.c (init_environment): If GetLocaleInfo returns "ZZZ" as
the "language name" for LOCALE_USER_DEFAULT, try again with locale
ID based on what GetUserDefaultUILanguage returns. (Bug#39286)
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/w32-fns.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index eb12dcd8960..687afc828d1 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -252,6 +252,7 @@ bit output with no translation." (w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592) (w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593) (w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594) + (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595) (w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596) (w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597) (w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255) |