mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 21:56:31 +00:00
Revert "package/htop: remove 0xe2 from MetersPanel.c"
This reverts commit 93f080ba0a3d84bf3b23404e083b0a33cd5fa31d. This patch was intended for the next branch, it shouldn't have been applied to the master branch. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
93f080ba0a
commit
23524c8e12
@ -1,52 +0,0 @@
|
|||||||
From ae32d292ca641c08b6db8d2f7cfcce2a54d00835 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Romain Naour <romain.naour@gmail.com>
|
|
||||||
Date: Tue, 20 Feb 2018 23:09:24 +0100
|
|
||||||
Subject: [PATCH] MetersPanel: remove 0xe2 from MetersPanel.c
|
|
||||||
|
|
||||||
This non ascii character trigger an issue with MakeHeader.py.
|
|
||||||
|
|
||||||
./scripts/MakeHeader.py MetersPanel.c
|
|
||||||
Traceback (most recent call last):
|
|
||||||
File "./scripts/MakeHeader.py", line 32, in <module>
|
|
||||||
for line in file.readlines():
|
|
||||||
File "[...]/output/host/lib/python3.6/encodings/ascii.py", line 26, in decode
|
|
||||||
return codecs.ascii_decode(input, self.errors)[0]
|
|
||||||
UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 956: ordinal not in range(128)
|
|
||||||
|
|
||||||
http://autobuild.buildroot.net/results/8ed/8edb78b054a265447fd0e83f67cba5f978be4ed6/build-end.log
|
|
||||||
|
|
||||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
||||||
---
|
|
||||||
MetersPanel.c | 2 +-
|
|
||||||
MetersPanel.h | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/MetersPanel.c b/MetersPanel.c
|
|
||||||
index 3cf3e07..47296a4 100644
|
|
||||||
--- a/MetersPanel.c
|
|
||||||
+++ b/MetersPanel.c
|
|
||||||
@@ -37,7 +37,7 @@ static const char* const MetersFunctions[] = {"Style ", "Move ", "
|
|
||||||
static const char* const MetersKeys[] = {"Space", "Enter", " ", "Del", "F10"};
|
|
||||||
static int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)};
|
|
||||||
|
|
||||||
-// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese
|
|
||||||
+// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese
|
|
||||||
// terminals, breaking our aligning.
|
|
||||||
// In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
|
|
||||||
// considered "Ambiguous characters".
|
|
||||||
diff --git a/MetersPanel.h b/MetersPanel.h
|
|
||||||
index e00169c..e80754a 100644
|
|
||||||
--- a/MetersPanel.h
|
|
||||||
+++ b/MetersPanel.h
|
|
||||||
@@ -29,7 +29,7 @@ struct MetersPanel_ {
|
|
||||||
|
|
||||||
// Note: In code the meters are known to have bar/text/graph "Modes", but in UI
|
|
||||||
// we call them "Styles".
|
|
||||||
-// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese
|
|
||||||
+// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese
|
|
||||||
// terminals, breaking our aligning.
|
|
||||||
// In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
|
|
||||||
// considered "Ambiguous characters".
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user