# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 1066949807 0
# Node ID e165768a25a7586fbe36f521fc340d051a83a6f1
# Parent  fdaea0df1212279d52be9b0f8fe05e5716c1990c
(locale-charset-to-coding-system):
Don't rely on nil being a coding system.

diff -r fdaea0df1212 -r e165768a25a7 lisp/international/mule-cmds.el
--- 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