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

Merge vendor changes onto mainline.

Browse Source
This commit is contained in:
Paul Saab 2000-07-14 09:57:37 +00:00
parent 94cc830866
commit 15596da42f
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/less/command.c
View File

@ -52,6 +52,7 @@ extern char *editor;
extern char *editproto;
#endif
extern int screen_trashed; /* The screen has been overwritten */
extern int shift_count;
static char ungot[UNGOT_SIZE];
static char *ungotp = NULL;
@ -1508,7 +1509,8 @@ commands()
case A_LSHIFT:
if (number <= 0)
number = 8;
number = (shift_count > 0) ?
shift_count : sc_width / 2;
if (number > hshift)
number = hshift;
hshift -= number;
@ -1517,7 +1519,8 @@ commands()
case A_RSHIFT:
if (number <= 0)
number = 8;
number = (shift_count > 0) ?
shift_count : sc_width / 2;
hshift += number;
screen_trashed = 1;
break;

14
contrib/less/less.h
View File

@ -360,6 +360,20 @@ struct textlist
#define LSIGNAL(sig,func) signal(sig,func)
#endif
#if HAVE_SIGPROCMASK
#if HAVE_SIGSET_T
#else
#undef HAVE_SIGPROCMASK
#endif
#endif
#if HAVE_SIGPROCMASK
#if HAVE_SIGEMPTYSET
#else
#undef sigemptyset
#define sigemptyset(mp) *(mp) = 0
#endif
#endif
#define S_INTERRUPT 01
#define S_STOP 02
#define S_WINCH 04

4
contrib/less/search.c
View File

@ -54,6 +54,7 @@ extern int sc_height;
extern int jump_sline;
extern int bs_mode;
extern int more_mode;
extern int status_col;
extern POSITION start_attnpos;
extern POSITION end_attnpos;
#if HILITE_SEARCH
@ -511,7 +512,8 @@ is_hilited(pos, epos, nohide)
{
struct hilite *hl;
if (start_attnpos != NULL_POSITION &&
if (!status_col &&
start_attnpos != NULL_POSITION &&
pos < end_attnpos &&
(epos == NULL_POSITION || epos > start_attnpos))
/*