Merge pull request #14307 from poettering/unicode-fuckup

locale-util: drop weird invisible unicode codepoints accidentally ins…
Merge pull request #14317 from poettering/hwdb-indent-fix
2019-12-11 13:49:01 -08:00 · 2019-12-11 13:35:22 -08:00 · 2019-12-11 21:46:23 +01:00 · 2019-12-11 21:38:52 +01:00
2 changed files with 4 additions and 4 deletions
--- a/hwdb.d/70-mouse.hwdb
+++ b/hwdb.d/70-mouse.hwdb
@ -728,9 +728,9 @@ mouse:usb:v1038p1369:name:SteelSeries Sensei Raw Gaming Mouse:
 mouse:usb:v145fp01ac:name:HID-compliant Mouse Trust Gaming Mouse:
 MOUSE_DPI=*800@528 1200@537 1600@536 2400@521
- ##########################################
+##########################################
- # Zelotes
+# Zelotes
- ##########################################
+##########################################
 # Zelotes 5500 DPI 7 Button USB Wired Gaming Mouse
 mouse:usb:v1d57pad17:*
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@ -377,7 +377,7 @@ const char *special_glyph(SpecialGlyph code) {
                        [SPECIAL_GLYPH_SLIGHTLY_HAPPY_SMILEY]   = "\360\237\231\202",         /* 🙂 */
                        [SPECIAL_GLYPH_NEUTRAL_SMILEY]          = "\360\237\230\220",         /* 😐 */
                        [SPECIAL_GLYPH_SLIGHTLY_UNHAPPY_SMILEY] = "\360\237\231\201",         /* 🙁 */
-                        [SPECIAL_GLYPH_UNHAPPY_SMILEY]          = "\360\237\230\250",         /* 😨️️ */
+                        [SPECIAL_GLYPH_UNHAPPY_SMILEY]          = "\360\237\230\250",         /* 😨 */
                        [SPECIAL_GLYPH_DEPRESSED_SMILEY]        = "\360\237\244\242",         /* 🤢 */
                },
        };
Author	SHA1	Message	Date
Anita Zhang	699b890bf3	Merge pull request #14307 from poettering/unicode-fuckup locale-util: drop weird invisible unicode codepoints accidentally ins…	2019-12-11 13:49:01 -08:00
Anita Zhang	faf9f10e17	Merge pull request #14317 from poettering/hwdb-indent-fix hwdb: trivial indentation fix	2019-12-11 13:35:22 -08:00
Lennart Poettering	5e13bcdd03	locale-util: drop weird invisible unicode codepoints accidentally inserted in comment	2019-12-11 21:46:23 +01:00
Lennart Poettering	c498df3a7e	hwdb: trivial indentation fix	2019-12-11 21:38:52 +01:00