Vendor import of less v529.vendor/less/v529

1 files changed, 16 insertions, 8 deletions

diff --git a/cmdbuf.c b/cmdbuf.c
index 02fa231f2e29..db5b2595f9a5 100644
--- a/cmdbuf.c
+++ b/cmdbuf.c
@@ -40,7 +40,7 @@ static int in_completion = 0;
 static char *tk_text;
 static char *tk_original;
 static char *tk_ipoint;
-static char *tk_trial;
+static char *tk_trial = NULL;
 static struct textlist tk_tlist;
 #endif
 
@@ -323,8 +323,8 @@ cmd_home()
 	static void
 cmd_lshift()
 {
-	constant char *s;
-	constant char *save_cp;
+	char *s;
+	char *save_cp;
 	int cols;
 
 	/*
@@ -342,7 +342,7 @@ cmd_lshift()
 	while (*s != '\0')
 	{
 		int width;
-		constant char *ns = s;
+		char *ns = s;
 		cmd_step_right(&ns, &width, NULL);
 		if (width > 0)
 			break;
@@ -361,8 +361,8 @@ cmd_lshift()
 	static void
 cmd_rshift()
 {
-	constant char *s;
-	constant char *save_cp;
+	char *s;
+	char *save_cp;
 	int cols;
 
 	/*
@@ -427,8 +427,9 @@ cmd_right()
 cmd_left()
 {
 	char *ncp;
-	int width, bswidth;
-	
+	int width = 0;
+	int bswidth = 0;
+
 	if (cp <= cmdbuf)
 	{
 		/* Already at the beginning of the line */
@@ -1223,6 +1224,13 @@ cmd_char(c)
 			*cmd_mbc_buf = c;
 			if (IS_ASCII_OCTET(c))
 				cmd_mbc_buf_len = 1;
+#if MSDOS_COMPILER || OS2
+			else if (c == (unsigned char) '\340' && IS_ASCII_OCTET(peekcc()))
+			{
+				/* Assume a special key. */
+				cmd_mbc_buf_len = 1;
+			}
+#endif
 			else if (IS_UTF8_LEAD(c))
 			{
 				cmd_mbc_buf_len = utf_len(c);