Merge branch 'maint'

diff --git a/pretty.c b/pretty.c
index f49929479f7e68a5214b6b55c31f10e6151c1787..c0184080998734450b250aa7dc72c427e1ecac8a 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -83,8 +83,7 @@ static int get_one_line(const char *msg)
 /* High bit set, or ISO-2022-INT */
 int non_ascii(int ch)
 {
-       ch = (ch & 0xff);
-       return ((ch & 0x80) || (ch == 0x1b));
+       return !isascii(ch) || ch == '\033';
 }
 
 static int is_rfc2047_special(char ch)