* locale/programs/ld-collate.c (collate_read): Allow order_start
after copy.
This commit is contained in:
parent
61d5a67f53
commit
762422d1bd
|
@ -1,5 +1,8 @@
|
||||||
2007-04-27 Ulrich Drepper <drepper@redhat.com>
|
2007-04-27 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* locale/programs/ld-collate.c (collate_read): Allow order_start
|
||||||
|
after copy.
|
||||||
|
|
||||||
* locale/programs/ld-collate.c (collate_read): Fix printing of
|
* locale/programs/ld-collate.c (collate_read): Fix printing of
|
||||||
error message.
|
error message.
|
||||||
|
|
||||||
|
|
|
@ -3132,7 +3132,7 @@ error while adding equivalent collating symbol"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state != 0 && state != 1)
|
if (state != 0 && state != 1 && state != 2)
|
||||||
goto err_label;
|
goto err_label;
|
||||||
state = 1;
|
state = 1;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,13 @@
|
||||||
2007-04-27 Ulrich Drepper <drepper@redhat.com>
|
2007-04-27 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
[BZ #4024]
|
||||||
|
* locales/iso14651_t1: Include iso14651_t1_common for common
|
||||||
|
sorting data.
|
||||||
|
* locales/iso14651_t1_common: New file.
|
||||||
|
* locales/iso14651_t1_pinyin: New file.
|
||||||
|
* locales/zh_CN (LC_COLLATE): Use iso14651_t1_pinyin instead of
|
||||||
|
iso14651_t1.
|
||||||
|
|
||||||
[BZ #3213]
|
[BZ #3213]
|
||||||
* locales/translit_neutral: Add entry for U2044.
|
* locales/translit_neutral: Add entry for U2044.
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -63,7 +63,7 @@ END LC_CTYPE
|
||||||
|
|
||||||
% ISO 14651 collation sequence
|
% ISO 14651 collation sequence
|
||||||
LC_COLLATE
|
LC_COLLATE
|
||||||
copy "iso14651_t1"
|
copy "iso14651_t1_pinyin"
|
||||||
END LC_COLLATE
|
END LC_COLLATE
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue