summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/term.c6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c
index c2c5cf8db..ddbac97a4 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2947,8 +2947,10 @@ get_bytes_from_buf(buf, bytes, num_bytes)
return -1;
if (buf[len++] == (int)KS_ZERO)
c = NUL;
- ++len; /* skip KE_FILLER */
- /* else it should be KS_SPECIAL, and c already equals K_SPECIAL */
+ /* else it should be KS_SPECIAL; when followed by KE_FILLER c is
+ * K_SPECIAL, or followed by KE_CSI and c must be CSI. */
+ if (buf[len++] == (int)KE_CSI)
+ c = CSI;
}
else if (c == CSI && buf[len] == KS_EXTRA
&& buf[len + 1] == (int)KE_CSI)
diff --git a/src/version.c b/src/version.c
index 66406736c..5cd95de37 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1281,
+/**/
1280,
/**/
1279,