=== modified file 'driver-csi.c'
--- driver-csi.c	2017-03-30 13:05:04 +0000
+++ driver-csi.c	2017-03-29 21:42:11 +0000
@@ -664,7 +664,7 @@
 
 #ifdef DEBUG
   fprintf(stderr, "Found a control string: %*s",
-      str_end - introlen, tk->buffer + tk->buffstart + introlen);
+      str_end - introlen, tk->buffer + introlen);
 #endif
 
   *nbytep = str_end + 1;
@@ -679,7 +679,7 @@
   csi->saved_string_id++;
   csi->saved_string = malloc(len + 1);
 
-  strncpy(csi->saved_string, (char *)tk->buffer + tk->buffstart + introlen, len);
+  strncpy(csi->saved_string, (char *)tk->buffer + introlen, len);
   csi->saved_string[len] = 0;
 
   key->type = (CHARAT(introlen-1) & 0x1f) == 0x10 ?