d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts after less(1) v406 import.

Browse Source 
Approved by:	re (hrs)
This commit is contained in:
Xin LI 2007-06-21 10:44:50 +00:00
parent 811fe9ccfe
commit aa22b8b669
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=170967
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/less/command.c
View File

@ -87,7 +87,7 @@ static void multi_search();
cmd_exec()
{
clear_attn();
line_left();
clear_bot();
flush();
}

3
contrib/less/forwback.c
View File

@ -142,9 +142,6 @@ forw(n, pos, force, only_last, nblank)
clear();
home();
}
} else
{
clear_bot();
}
if (pos != position(BOTTOM_PLUS_ONE) || empty_screen())

18
contrib/less/screen.c
View File

@ -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));