aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--locale/programs/ld-name.c2
-rw-r--r--localedata/charmaps/ISO-8859-14
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8780963..af87d90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-06-24 Ulrich Drepper <drepper@redhat.com>
+ * locale/programs/ld-name.c (name_finish): Add missing format
+ specifier to test for name_fmt.
+
* locale/programs/ld-address.c (iso639): Correct length of string
elements.
diff --git a/locale/programs/ld-name.c b/locale/programs/ld-name.c
index 6eeecd4..135e9bc 100644
--- a/locale/programs/ld-name.c
+++ b/locale/programs/ld-name.c
@@ -122,7 +122,7 @@ name_finish (struct localedef_t *locale, struct charmap_t *charmap)
if (*++cp == 'R')
/* Romanize-flag. */
++cp;
- if (strchr ("fFgGlomMpsSt", *cp) == NULL)
+ if (strchr ("dfFgGlomMpsSt", *cp) == NULL)
{
error (0, 0, _("\
%s: invalid escape sequence in field `%s'"),
diff --git a/localedata/charmaps/ISO-8859-1 b/localedata/charmaps/ISO-8859-1
index 6e360e2..673c0ed 100644
--- a/localedata/charmaps/ISO-8859-1
+++ b/localedata/charmaps/ISO-8859-1
@@ -271,6 +271,6 @@ CHARMAP
END CHARMAP
WIDTH
-<SP>...<'?> 1
-<NS>...<y:> 1
+<U0020>...<U007E> 1
+<U00A0>...<U00FF> 1
END WIDTH