Update from gnulib.
diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
index 9d14ce8..a79d38b 100644
--- a/libcharset/lib/ChangeLog
+++ b/libcharset/lib/ChangeLog
@@ -1,3 +1,10 @@
+2019-07-02 Bruno Haible <bruno@clisp.org>
+
+ Update from gnulib.
+ 2019-07-02 Bruno Haible <bruno@clisp.org>
+ * localcharset.c (locale_charset): Return "UTF-8" instead of
+ "CPutf8".
+
2019-01-27 Bruno Haible <bruno@clisp.org>
Accommodate a shell that is not in /bin/sh.
diff --git a/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c
index 3effe1d..da3ac45 100644
--- a/libcharset/lib/localcharset.c
+++ b/libcharset/lib/localcharset.c
@@ -1,6 +1,6 @@
/* Determine a canonical name for the current locale's character encoding.
- Copyright (C) 2000-2006, 2008-2018 Free Software Foundation, Inc.
+ Copyright (C) 2000-2006, 2008-2019 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -787,7 +787,12 @@
encoding is the best bet. */
sprintf (buf, "CP%u", GetACP ());
}
- codeset = buf;
+ /* For a locale name such as "French_France.65001", in Windows 10,
+ setlocale now returns "French_France.utf8" instead. */
+ if (strcmp (buf + 2, "65001") == 0 || strcmp (buf + 2, "utf8") == 0)
+ codeset = "UTF-8";
+ else
+ codeset = buf;
# elif defined OS2
