summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>2001-06-06 10:35:16 +0000
committerDave Love <fx@gnu.org>2001-06-06 10:35:16 +0000
commita69302198d750ba535c5e9ed778ebedf84d1dd3a (patch)
tree0c8fc9325762eaa6006974102747f9fc952b0147
parente7c41a008ae9191f7a5cf8bdc0bf4108d3e4d8db (diff)
downloademacs-a69302198d750ba535c5e9ed778ebedf84d1dd3a.tar.gz
(locale-language-names): Remove pattern for utf.
(locale-preferred-coding-systems): Add pattern for utf.
-rw-r--r--lisp/international/mule-cmds.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5cb73091397..e370a83f718 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1650,10 +1650,6 @@ of buffer-file-coding-system set by this function."
(defvar locale-language-names
'(
- ;; UTF-8 is not yet implemented.
- ;; Put this first, so that e.g. "ko.UTF-8" does not match "ko" below.
- (".*[._]utf" . nil)
-
;; Locale names of the form LANGUAGE[_TERRITORY][.CODESET][@MODIFIER]
;; as specified in the Single Unix Spec, Version 2.
;; LANGUAGE is a language code taken from ISO 639:1988 (E/F)
@@ -1849,7 +1845,7 @@ the language name that would otherwise be used for this locale.")
("ja.*[._]jis7" . iso-2022-jp)
("ja.*[._]pck" . japanese-shift-jis)
("ja.*[._]sjis" . japanese-shift-jis)
- )
+ (".*[._]utf" . utf-8))
"List of pairs of locale regexps and preferred coding systems.
The first element whose locale regexp matches the start of a downcased locale
specifies the coding system to prefer when using that locale.")