Resolve conflicts after less(1) v406 import.

Approved by:	re (hrs)

3 files changed, 19 insertions, 4 deletions

diff --git a/contrib/less/command.c b/contrib/less/command.c
index bac2431..032606b 100644
--- a/contrib/less/command.c
+++ b/contrib/less/command.c
@@ -87,7 +87,7 @@ static void multi_search();
 cmd_exec()
 {
 	clear_attn();
-	line_left();
+	clear_bot();
 	flush();
 }
 
diff --git a/contrib/less/forwback.c b/contrib/less/forwback.c
index 309eef6..08a9721 100644
--- a/contrib/less/forwback.c
+++ b/contrib/less/forwback.c
@@ -142,9 +142,6 @@ forw(n, pos, force, only_last, nblank)
 				clear();
 				home();
 			}
-		} else
-		{
-			clear_bot();
 		}
 
 		if (pos != position(BOTTOM_PLUS_ONE) || empty_screen())
diff --git a/contrib/less/screen.c b/contrib/less/screen.c
index 399ffc3..e217b86 100644
--- a/contrib/less/screen.c
+++ b/contrib/less/screen.c
@@ -626,7 +626,25 @@ ltget_env(capname)
 	char *capname;
 {
 	char name[16];
+	char *s;
 
+	s = lgetenv("LESS_TERMCAP_DEBUG");
+	if (s != NULL && *s != '\0')
+	{
+		struct env { struct env *next; char *name; char *value; };
+		static struct env *envs = NULL;
+		struct env *p;
+		for (p = envs;  p != NULL;  p = p->next)
+			if (strcmp(p->name, capname) == 0)
+				return p->value;
+		p = (struct env *) ecalloc(1, sizeof(struct env));
+		p->name = save(capname);
+		p->value = (char *) ecalloc(strlen(capname)+3, sizeof(char));
+		sprintf(p->value, "<%s>", capname);
+		p->next = envs;
+		envs = p;
+		return p->value;
+	}
 	strcpy(name, "LESS_TERMCAP_");
 	strcat(name, capname);
 	return (lgetenv(name));