diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2019-07-09 10:41:31 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2019-07-09 10:41:31 +0000 |
| commit | 1431ff07174b3ac7a40d2ff86e94ae46689a6cd3 (patch) | |
| tree | efeb690dd10c520ce56d044983a770e281cae832 | |
| parent | 74a6c12742b156eb70b6147ba74723b5a87716e7 (diff) | |
| parent | 4fe42771ecaa81fc40eaaf2f7e24c8f3a4117a77 (diff) | |
| download | glib-1431ff07174b3ac7a40d2ff86e94ae46689a6cd3.tar.gz | |
Merge branch 'backport-954-unicode-mani-glib-2-60' into 'glib-2-60'
Backport !954 “Fix the ISO 15924 code for Manichaean” to glib-2-60
See merge request GNOME/glib!956
| -rw-r--r-- | glib/gunicode.h | 2 | ||||
| -rw-r--r-- | glib/guniprop.c | 2 | ||||
| -rw-r--r-- | glib/tests/unicode.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/glib/gunicode.h b/glib/gunicode.h index 36f841b9d..cbb446ea9 100644 --- a/glib/gunicode.h +++ b/glib/gunicode.h @@ -563,7 +563,7 @@ typedef enum G_UNICODE_SCRIPT_KHUDAWADI, /* Sind */ G_UNICODE_SCRIPT_LINEAR_A, /* Lina */ G_UNICODE_SCRIPT_MAHAJANI, /* Mahj */ - G_UNICODE_SCRIPT_MANICHAEAN, /* Manu */ + G_UNICODE_SCRIPT_MANICHAEAN, /* Mani */ G_UNICODE_SCRIPT_MENDE_KIKAKUI, /* Mend */ G_UNICODE_SCRIPT_MODI, /* Modi */ G_UNICODE_SCRIPT_MRO, /* Mroo */ diff --git a/glib/guniprop.c b/glib/guniprop.c index 793103182..10c8a9361 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -1404,7 +1404,7 @@ static const guint32 iso15924_tags[] = PACK ('S','i','n','d'), /* G_UNICODE_SCRIPT_KHUDAWADI */ PACK ('L','i','n','a'), /* G_UNICODE_SCRIPT_LINEAR_A */ PACK ('M','a','h','j'), /* G_UNICODE_SCRIPT_MAHAJANI */ - PACK ('M','a','n','u'), /* G_UNICODE_SCRIPT_MANICHAEAN */ + PACK ('M','a','n','i'), /* G_UNICODE_SCRIPT_MANICHAEAN */ PACK ('M','e','n','d'), /* G_UNICODE_SCRIPT_MENDE_KIKAKUI */ PACK ('M','o','d','i'), /* G_UNICODE_SCRIPT_MODI */ PACK ('M','r','o','o'), /* G_UNICODE_SCRIPT_MRO */ diff --git a/glib/tests/unicode.c b/glib/tests/unicode.c index 34c697150..ea4291043 100644 --- a/glib/tests/unicode.c +++ b/glib/tests/unicode.c @@ -866,7 +866,7 @@ test_iso15924 (void) { G_UNICODE_SCRIPT_KHUDAWADI, "Sind" }, { G_UNICODE_SCRIPT_LINEAR_A, "Lina" }, { G_UNICODE_SCRIPT_MAHAJANI, "Mahj" }, - { G_UNICODE_SCRIPT_MANICHAEAN, "Manu" }, + { G_UNICODE_SCRIPT_MANICHAEAN, "Mani" }, { G_UNICODE_SCRIPT_MENDE_KIKAKUI, "Mend" }, { G_UNICODE_SCRIPT_MODI, "Modi" }, { G_UNICODE_SCRIPT_MRO, "Mroo" }, |