[at-spi2-core: 2/2] Merge branch 'keysym2ucs-sort' into 'master'

[Mike Gorse <mgorse src gnome org>]

commit 4ad5a49ff62de8a0858bb1da167aec885089b30f
Merge: 2546d35 98a7053
Author: Mike Gorse <mgorse suse com>
Date:   Tue Jul 7 11:30:31 2020 +0000

    Merge branch 'keysym2ucs-sort' into 'master'
    
    Fix keysymtab ordering by ucs2
    
    See merge request GNOME/at-spi2-core!34

 registryd/ucs2keysym.c | 190 ++++++++++++++++++++++++-------------------------
 1 file changed, 95 insertions(+), 95 deletions(-)
---
diff --cc registryd/ucs2keysym.c
index 3c939eb,20d13fc..65e0ca2
--- a/registryd/ucs2keysym.c
+++ b/registryd/ucs2keysym.c
@@@ -622,16 -622,14 +622,16 @@@ struct codepair 
    { 0x09f2, 0x23bc }, /*              horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */
    { 0x09f3, 0x23bd }, /*              horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */
    { 0x09e2, 0x2409 }, /*                          ht ␉ SYMBOL FOR HORIZONTAL TABULATION */
+   { 0x09e5, 0x240a }, /*                          lf ␊ SYMBOL FOR LINE FEED */
+   { 0x09e9, 0x240b }, /*                          vt ␋ SYMBOL FOR VERTICAL TABULATION */
    { 0x09e3, 0x240c }, /*                          ff ␌ SYMBOL FOR FORM FEED */
    { 0x09e4, 0x240d }, /*                          cr ␍ SYMBOL FOR CARRIAGE RETURN */
-   { 0x09e5, 0x240a }, /*                          lf ␊ SYMBOL FOR LINE FEED */
    { 0x09e8, 0x2424 }, /*                          nl ␤ SYMBOL FOR NEWLINE */
-   { 0x09e9, 0x240b }, /*                          vt ␋ SYMBOL FOR VERTICAL TABULATION */
  
    { 0x08a3, 0x2500 }, /*              horizconnector ─ BOX DRAWINGS LIGHT HORIZONTAL */
 +  { 0x09f1, 0x2500 }, /*              horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */
    { 0x08a6, 0x2502 }, /*               vertconnector │ BOX DRAWINGS LIGHT VERTICAL */
 +  { 0x09f8, 0x2502 }, /*                     vertbar │ BOX DRAWINGS LIGHT VERTICAL */
    { 0x08a2, 0x250c }, /*              topleftradical ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
    { 0x09ec, 0x250c }, /*                upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
    { 0x09eb, 0x2510 }, /*               uprightcorner ┐ BOX DRAWINGS LIGHT DOWN AND LEFT */