880579f55a
In addition to setting USES=ncurses: * align MASTER_SITES * align USES * change USES operator from += to = * line to libncurses rather than libtermcap * regenerate patches with makepatch approved by: infrastructure blanket
42 lines
853 B
C
42 lines
853 B
C
--- charset.c.orig 2013-04-04 16:55:05 UTC
|
|
+++ charset.c
|
|
@@ -407,6 +407,10 @@ binary_char(c)
|
|
control_char(c)
|
|
LWCHAR c;
|
|
{
|
|
+#ifdef COLOR_LESS
|
|
+ if (c == ESC)
|
|
+ return 0;
|
|
+#endif
|
|
c &= 0377;
|
|
return (chardef[c] & IS_CONTROL_CHAR);
|
|
}
|
|
@@ -422,6 +426,20 @@ prchar(c)
|
|
/* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */
|
|
static char buf[32];
|
|
|
|
+#ifdef COLOR_LESS
|
|
+ if(c == ESC)
|
|
+ sprintf(buf, "%c", ESC);
|
|
+ else
|
|
+ {
|
|
+ c &= 0377;
|
|
+ if (!control_char(c))
|
|
+ sprintf(buf, "%c", c);
|
|
+ else if (!control_char(c ^ 0100))
|
|
+ sprintf(buf, "^%c", c ^ 0100);
|
|
+ else
|
|
+ sprintf(buf, binfmt, c);
|
|
+ }
|
|
+#else
|
|
c &= 0377;
|
|
if ((c < 128 || !utf_mode) && !control_char(c))
|
|
SNPRINTF1(buf, sizeof(buf), "%c", (int) c);
|
|
@@ -445,6 +463,7 @@ prchar(c)
|
|
#endif
|
|
else
|
|
SNPRINTF1(buf, sizeof(buf), binfmt, c);
|
|
+#endif
|
|
return (buf);
|
|
}
|
|
|