font charset is iso8859-1, not iso-8859-1.

Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
	font charset is iso8859-1, not iso-8859-1.

ChangeLog

+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+	font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

ChangeLog.pre-2-0

+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+	font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

ChangeLog.pre-2-10

+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+	font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

ChangeLog.pre-2-2

+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+	font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

ChangeLog.pre-2-4

+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+	font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

ChangeLog.pre-2-6

+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+	font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

ChangeLog.pre-2-8

+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+	font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

gdk/x11/gdkfont-x11.c

@@ -141,6 +141,7 @@ gdk_font_charset_for_locale ()
 {
   static char *charset_map[][2] = {
     { "ANSI_X3.4-1968", "iso8859-1" },
+    { "US-ASCII",   "iso8859-1" },
     { "ISO-8859-1", "iso8859-1" },
     { "ISO-8859-2", "iso8859-2" },
     { "ISO-8859-3", "iso8859-3" },
@@ -150,7 +151,7 @@ gdk_font_charset_for_locale ()
     { "ISO-8859-7", "iso8859-7" },
     { "ISO-8859-8", "iso8859-8" },
     { "ISO-8859-9", "iso8859-9" },
-    { "UTF-8", "iso8859-1" }
+    { "UTF-8",      "iso8859-1" }
   };
 
   char *codeset;
@@ -169,7 +170,7 @@ gdk_font_charset_for_locale ()
   if (result)
     return g_strdup (result);
   else
-    return g_strdup ("iso-8859-1");
+    return g_strdup ("iso8859-1");
 };
 
 /**