Vendor import of less v444.
This commit is contained in:
parent
6ea5918889
commit
3541bdeba0
9
NEWS
9
NEWS
@ -10,6 +10,15 @@
|
||||
To report bugs, suggestions or comments, send email to
|
||||
bug-less@gnu.org or markn@greenwoodsoftware.com.
|
||||
|
||||
======================================================================
|
||||
|
||||
Major changes between "less" versions 443 and 444
|
||||
|
||||
* Fix bug in unget handling that can cause strange effects on the
|
||||
command line.
|
||||
|
||||
* Remove vestiges of obsolete -l option that can cause a crash.
|
||||
|
||||
======================================================================
|
||||
|
||||
Major changes between "less" versions 436 and 443
|
||||
|
4
README
4
README
@ -1,7 +1,7 @@
|
||||
|
||||
Less, version 443
|
||||
Less, version 444
|
||||
|
||||
This is the distribution of less, version 443, released 09 Apr 2011.
|
||||
This is the distribution of less, version 444, released 09 Jun 2011.
|
||||
This program is part of the GNU project (http://www.gnu.org).
|
||||
|
||||
This program is free software. You may redistribute it and/or
|
||||
|
@ -300,6 +300,7 @@ is_erase_char(c)
|
||||
*/
|
||||
static int
|
||||
mca_opt_first_char(c)
|
||||
int c;
|
||||
{
|
||||
int flag = (optflag & ~OPT_NO_PROMPT);
|
||||
if (flag == OPT_NO_TOGGLE)
|
||||
@ -839,6 +840,7 @@ ungetcc(c)
|
||||
ug->ug_char = c;
|
||||
ug->ug_next = ungot;
|
||||
ungot = ug;
|
||||
unget_end = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
1
funcs.h
1
funcs.h
@ -194,7 +194,6 @@
|
||||
public void unmark ();
|
||||
public void opt_o ();
|
||||
public void opt__O ();
|
||||
public void opt_l ();
|
||||
public void opt_j ();
|
||||
public void calc_jump_sline ();
|
||||
public void opt_shift ();
|
||||
|
4
less.man
4
less.man
@ -1156,7 +1156,7 @@ LESS(1) LESS(1)
|
||||
next 8bcccbcc18b95.bb125.bb
|
||||
|
||||
If neither LESSCHARSET nor LESSCHARDEF is set, but any of the strings
|
||||
"UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_TYPE or
|
||||
"UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_CTYPE or
|
||||
LANG environment variables, then the default character set is utf-8.
|
||||
|
||||
If that string is not found, but your system supports the [4msetlocale[0m
|
||||
@ -1580,4 +1580,4 @@ LESS(1) LESS(1)
|
||||
|
||||
|
||||
|
||||
Version 443: 09 Apr 2011 LESS(1)
|
||||
Version 444: 09 Jun 2011 LESS(1)
|
||||
|
4
less.nro
4
less.nro
@ -1,4 +1,4 @@
|
||||
.TH LESS 1 "Version 443: 09 Apr 2011"
|
||||
.TH LESS 1 "Version 444: 09 Jun 2011"
|
||||
.SH NAME
|
||||
less \- opposite of more
|
||||
.SH SYNOPSIS
|
||||
@ -1276,7 +1276,7 @@ to each of the possible values for LESSCHARSET:
|
||||
.PP
|
||||
If neither LESSCHARSET nor LESSCHARDEF is set,
|
||||
but any of the strings "UTF-8", "UTF8", "utf-8" or "utf8"
|
||||
is found in the LC_ALL, LC_TYPE or LANG
|
||||
is found in the LC_ALL, LC_CTYPE or LANG
|
||||
environment variables, then the default character set is utf-8.
|
||||
.PP
|
||||
If that string is not found, but your system supports the
|
||||
|
@ -46,4 +46,4 @@ LESSECHO(1) LESSECHO(1)
|
||||
|
||||
|
||||
|
||||
Version 443: 09 Apr 2011 LESSECHO(1)
|
||||
Version 444: 09 Jun 2011 LESSECHO(1)
|
||||
|
@ -1,4 +1,4 @@
|
||||
.TH LESSECHO 1 "Version 443: 09 Apr 2011"
|
||||
.TH LESSECHO 1 "Version 444: 09 Jun 2011"
|
||||
.SH NAME
|
||||
lessecho \- expand metacharacters
|
||||
.SH SYNOPSIS
|
||||
|
@ -354,4 +354,4 @@ LESSKEY(1) LESSKEY(1)
|
||||
|
||||
|
||||
|
||||
Version 443: 09 Apr 2011 LESSKEY(1)
|
||||
Version 444: 09 Jun 2011 LESSKEY(1)
|
||||
|
@ -1,4 +1,4 @@
|
||||
.TH LESSKEY 1 "Version 443: 09 Apr 2011"
|
||||
.TH LESSKEY 1 "Version 444: 09 Jun 2011"
|
||||
.SH NAME
|
||||
lesskey \- specify key bindings for less
|
||||
.SH SYNOPSIS
|
||||
|
28
optfunc.c
28
optfunc.c
@ -131,34 +131,6 @@ opt__O(type, s)
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Handlers for -l option.
|
||||
*/
|
||||
public void
|
||||
opt_l(type, s)
|
||||
int type;
|
||||
char *s;
|
||||
{
|
||||
int err;
|
||||
int n;
|
||||
char *t;
|
||||
|
||||
switch (type)
|
||||
{
|
||||
case INIT:
|
||||
t = s;
|
||||
n = getnum(&t, "l", &err);
|
||||
if (err || n <= 0)
|
||||
{
|
||||
error("Line number is required after -l", NULL_PARG);
|
||||
return;
|
||||
}
|
||||
plusoption = TRUE;
|
||||
ungetsc(s);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Handlers for -j option.
|
||||
*/
|
||||
|
4
opttbl.c
4
opttbl.c
@ -263,10 +263,6 @@ static struct loption option[] =
|
||||
NULL
|
||||
}
|
||||
},
|
||||
{ 'l', NULL,
|
||||
STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_l,
|
||||
{ NULL, NULL, NULL }
|
||||
},
|
||||
{ 'L', &L__optname,
|
||||
BOOL, OPT_ON, &use_lessopen, NULL,
|
||||
{
|
||||
|
@ -742,6 +742,7 @@ v441 1/21/11 Fix semi-infinite loop if no newlines in file;
|
||||
v442 3/2/11 Fix search bug.
|
||||
Add ctrl-G line edit command.
|
||||
v443 4/9/11 Fix Windows build.
|
||||
v444 6/8/11 Fix ungetc bug; remove vestiges of obsolete -l option.
|
||||
*/
|
||||
|
||||
char version[] = "443";
|
||||
char version[] = "444";
|
||||
|
Loading…
Reference in New Issue
Block a user