From 9c1084a38005ab319ce3f34e2faf087b59e9b0e8 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 1 Feb 2002 21:08:09 +0000
Subject: [PATCH] Update.

2002-01-18  Isamu Hasegawa  <isamu@yamato.ibm.com>

	* locale/program/ld-collate.c (collate_finish): Assign a wide
	char collation sequence value to multi character collating
	elements, and avoid over writing by non-character elements.
---
 ChangeLog                    |  6 ++++++
 locale/programs/ld-collate.c | 10 +++++++---
 localedata/ChangeLog         |  4 ++++
 localedata/da_DK.in          |  7 +++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23a5bbe1c2..d03f977ec7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-18  Isamu Hasegawa  <isamu@yamato.ibm.com>
+
+	* locale/program/ld-collate.c (collate_finish): Assign a wide
+	char collation sequence value to multi character collating
+	elements, and avoid over writing by non-character elements.
+
 2002-02-01  Ulrich Drepper  <drepper@redhat.com>
 
 	* elf/Makefile (distribute): Add dl-procinfo.c.
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 4f587c113c..0da1261bd8 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
@@ -1672,6 +1672,9 @@ collate_finish (struct localedef_t *locale, const struct charmap_t *charmap)
 
 	  runp->wcseqorder = wcseqact++;
 	}
+      else if (runp->mbs != NULL && runp->weights != NULL)
+	/* This is for collation elements.  */
+	runp->wcseqorder = wcseqact++;
 
       /* Up to the next entry.  */
       runp = runp->next;
@@ -1706,8 +1709,9 @@ collate_finish (struct localedef_t *locale, const struct charmap_t *charmap)
 	  struct element_t *lastp;
 
 	  /* Insert the collation sequence value.  */
-	  collseq_table_add (&collate->wcseqorder, runp->wcs[0],
-			     runp->wcseqorder);
+	  if (runp->is_character)
+	    collseq_table_add (&collate->wcseqorder, runp->wcs[0],
+			       runp->wcseqorder);
 
 	  /* Find the point where to insert in the list.  */
 	  e = wchead_table_get (&collate->wcheads, runp->wcs[0]);
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index bfde824eda..55c919c897 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-01  Ulrich Drepper  <drepper@redhat.com>
+
+	* da_DK.in: Add a few more character sequences, no real words.
+
 2002-01-17  Ulrich Drepper  <drepper@redhat.com>
 
 	* charmaps/MACINTOSH: Update to Apple's latest definition.
diff --git a/localedata/da_DK.in b/localedata/da_DK.in
index 3cb1e0cdf1..4e9cf49b3e 100644
--- a/localedata/da_DK.in
+++ b/localedata/da_DK.in
@@ -1,3 +1,4 @@
+A
 A/S
 ANDRE
 ANDRÉ
@@ -29,6 +30,7 @@ R
 REE, B
 RÉE, L
 REE, V
+SA
 SCHYTT, B
 SCHYTT, H
 SCHÜTT, H
@@ -41,6 +43,9 @@ STORE VILDMOSE
 STOREKÆR
 STORM PETERSEN
 STORMLY
+SÅ
+SAA
+Saa
 THORVALD
 THORVARDUR
 ÞORVARÐUR
@@ -52,3 +57,5 @@ VESTERG
 ÄBLE
 ØBERG
 ÖBERG
+AA
+aa