Commit 0363e09a authored by Dave Love's avatar Dave Love
Browse files

(locale-charset-to-coding-system):

Don't rely on nil being a coding system.
parent 0c6b7a1f
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
2003-10-23 Dave Love <fx@gnu.org> 2003-10-23 Dave Love <fx@gnu.org>
* 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/mail-extr.el (mail-extr-ignore-single-names): Add :version.
(mail-extr-address-syntax-table): Remove non-ASCII unibyte chars. (mail-extr-address-syntax-table): Remove non-ASCII unibyte chars.
(mail-extr-voodoo): Use char classes in regexps (for non-ASCII). (mail-extr-voodoo): Use char classes in regexps (for non-ASCII).
......
...@@ -1981,6 +1981,13 @@ of `buffer-file-coding-system' set by this function." ...@@ -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. ;; http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html.
;; CODESET and MODIFIER are implementation-dependent. ;; 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 ; aa Afar
; ab Abkhazian ; ab Abkhazian
("af" . "Latin-1") ; Afrikaans ("af" . "Latin-1") ; Afrikaans
...@@ -2235,7 +2242,7 @@ is returned. Thus, for instance, if charset \"ISO8859-2\", ...@@ -2235,7 +2242,7 @@ is returned. Thus, for instance, if charset \"ISO8859-2\",
(if (locale-charset-match-p charset (caar cs)) (if (locale-charset-match-p charset (caar cs))
(setq c (intern (caar cs))) (setq c (intern (caar cs)))
(pop 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 ;; Fixme: This ought to deal with the territory part of the locale
;; too, for setting things such as calendar holidays, ps-print paper ;; too, for setting things such as calendar holidays, ps-print paper
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment