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

Virgin import of less v406.

Browse Source 
Approved by:	re (hrs)
This commit is contained in:
Xin LI 2007-06-21 10:42:55 +00:00
parent 7f074f9c8f
commit efd72c2eb6
15 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/less/NEWS
View File

@ -13,7 +13,7 @@
======================================================================
Major changes between "less" versions 394 and 403
Major changes between "less" versions 394 and 406
* Allow decimal point in number for % (percent) command.

4
contrib/less/README
View File

@ -1,7 +1,7 @@
Less, version 403
Less, version 406
This is the distribution of less, version 403, released 25 May 2007.
This is the distribution of less, version 406, released 19 Jun 2007.
This program is part of the GNU project (http://www.gnu.org).
This program is free software. You may redistribute it and/or

16
contrib/less/cmdbuf.c
View File

@ -1390,11 +1390,14 @@ init_cmdhist()
}
if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0)
ml = &mlist_search;
#if SHELL_ESCAPE || PIPEC
else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0)
{
#if SHELL_ESCAPE || PIPEC
ml = &mlist_shell;
#else
ml = NULL;
#endif
else if (*line == '"')
} else if (*line == '"')
{
if (ml != NULL)
cmd_addhist(ml, line+1);
@ -1444,11 +1447,18 @@ save_cmdhist()
#if CMD_HISTORY
char *filename;
FILE *f;
int modified = 0;
filename = histfile_name();
if (filename == NULL)
return;
if (!mlist_search.modified && !mlist_shell.modified)
if (mlist_search.modified)
modified = 1;
#if SHELL_ESCAPE || PIPEC
if (mlist_shell.modified)
modified = 1;
#endif
if (!modified)
return;
f = fopen(filename, "w");
free(filename);

2
contrib/less/command.c
View File

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

3
contrib/less/forwback.c
View File

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

2
contrib/less/less.man
View File

@ -1544,4 +1544,4 @@ LESS(1) LESS(1)
Version 403: 25 May 2007 LESS(1)
Version 406: 19 Jun 2007 LESS(1)

2
contrib/less/less.nro
View File

@ -1,4 +1,4 @@
.TH LESS 1 "Version 403: 25 May 2007"
.TH LESS 1 "Version 406: 19 Jun 2007"
.SH NAME
less \- opposite of more
.SH SYNOPSIS

2
contrib/less/lessecho.man
View File

@ -46,4 +46,4 @@ LESSECHO(1) LESSECHO(1)
Version 403: 25 May 2007 LESSECHO(1)
Version 406: 19 Jun 2007 LESSECHO(1)

2
contrib/less/lessecho.nro
View File

@ -1,4 +1,4 @@
.TH LESSECHO 1 "Version 403: 25 May 2007"
.TH LESSECHO 1 "Version 406: 19 Jun 2007"
.SH NAME
lessecho \- expand metacharacters
.SH SYNOPSIS

2
contrib/less/lesskey.man
View File

@ -357,4 +357,4 @@ LESSKEY(1) LESSKEY(1)
Version 403: 25 May 2007 LESSKEY(1)
Version 406: 19 Jun 2007 LESSKEY(1)

2
contrib/less/lesskey.nro
View File

@ -1,4 +1,4 @@
.TH LESSKEY 1 "Version 403: 25 May 2007"
.TH LESSKEY 1 "Version 406: 19 Jun 2007"
.SH NAME
lesskey \- specify key bindings for less
.SH SYNOPSIS

6
contrib/less/optfunc.c
View File

@ -45,6 +45,9 @@ extern char *hproto;
extern char *wproto;
extern IFILE curr_ifile;
extern char version[];
extern int jump_sline;
extern int jump_sline_fraction;
extern int less_is_more;
#if LOGFILE
extern char *namelogfile;
extern int force_logfile;
@ -53,9 +56,6 @@ extern int logfile;
#if TAGS
public char *tagoption = NULL;
extern char *tags;
extern int jump_sline;
extern int jump_sline_fraction;
extern int less_is_more;
#endif
#if MSDOS_COMPILER
extern int nm_fg_color, nm_bg_color;

18
contrib/less/screen.c
View File

@ -623,7 +623,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));

4
contrib/less/search.c
View File

@ -292,6 +292,7 @@ clear_attn()
POSITION old_end_attnpos;
POSITION pos;
POSITION epos;
int moved = 0;
if (start_attnpos == NULL_POSITION)
return;
@ -319,8 +320,11 @@ clear_attn()
(void) forw_line(pos);
goto_line(slinenum);
put_line();
moved = 1;
}
}
if (moved)
lower_left();
}
#endif

5
contrib/less/version.c
View File

@ -690,6 +690,9 @@ v401 3/24/07 Minor documentation fixes.
v402 3/30/07 Fix autoconf bug when memcpy etc are inline;
fix bug in terminating number following -j option.
v403 5/25/07 Fix Windows build.
v404 6/5/07 Fix display bug with F command and long lines.
v405 6/17/07 Fix display bug when using -w option.
v406 6/17/07 Fix secure build.
*/
char version[] = "403";
char version[] = "406";