From: Dave Love Date: Thu, 23 Oct 2003 22:57:58 +0000 (+0000) Subject: (locale-charset-to-coding-system): X-Git-Tag: ttn-vms-21-2-B4~8473 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0363e09a8304aafa6eb5ac0e022d46c92ace9a5c;p=emacs.git (locale-charset-to-coding-system): Don't rely on nil being a coding system. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 29f4bc97dde..61f656eb7c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,6 +5,9 @@ 2003-10-23 Dave Love + * international/mule-cmds.el (locale-charset-to-coding-system): + Don't rely on nil being a coding system. + * mail/mail-extr.el (mail-extr-ignore-single-names): Add :version. (mail-extr-address-syntax-table): Remove non-ASCII unibyte chars. (mail-extr-voodoo): Use char classes in regexps (for non-ASCII). diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index f29e11b8e26..fb918094d4c 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1981,6 +1981,13 @@ of `buffer-file-coding-system' set by this function." ;; 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 @@ is returned. Thus, for instance, if charset \"ISO8859-2\", (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