Mercurial > emacs
changeset 52926:e165768a25a7
(locale-charset-to-coding-system):
Don't rely on nil being a coding system.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Thu, 23 Oct 2003 22:56:47 +0000 |
| parents | fdaea0df1212 |
| children | 2a873c983524 |
| files | lisp/international/mule-cmds.el |
| diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el Thu Oct 23 20:47:07 2003 +0000 +++ b/lisp/international/mule-cmds.el Thu Oct 23 22:56:47 2003 +0000 @@ -1981,6 +1981,13 @@ ;; http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html. ;; CODESET and MODIFIER are implementation-dependent. + ;; jasonr comments: MS Windows uses three letter codes for + ;; languages instead of the two letter ISO codes that POSIX + ;; uses. In most cases the first two letters are the same, so + ;; most of the regexps in locale-language-names work. Japanese + ;; and Chinese are exceptions, which are listed in the + ;; non-standard section at the bottom of locale-language-names. + ; aa Afar ; ab Abkhazian ("af" . "Latin-1") ; Afrikaans @@ -2235,7 +2242,7 @@ (if (locale-charset-match-p charset (caar cs)) (setq c (intern (caar cs))) (pop cs))) - (coding-system-base c)))) + (if c (coding-system-base c))))) ;; Fixme: This ought to deal with the territory part of the locale ;; too, for setting things such as calendar holidays, ps-print paper