From 15596da42f9905cdd8f555a71d97490c0fbc146c Mon Sep 17 00:00:00 2001
From: Paul Saab <ps@FreeBSD.org>
Date: Fri, 14 Jul 2000 09:57:37 +0000
Subject: [PATCH] Merge vendor changes onto mainline.

---
 contrib/less/command.c |  7 +++++--
 contrib/less/less.h    | 14 ++++++++++++++
 contrib/less/search.c  |  4 +++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/contrib/less/command.c b/contrib/less/command.c
index b3fbedb3da1f..000cf0b1e848 100644
--- a/contrib/less/command.c
+++ b/contrib/less/command.c
@@ -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;
diff --git a/contrib/less/less.h b/contrib/less/less.h
index 1b446b533445..ca307d38c0c4 100644
--- a/contrib/less/less.h
+++ b/contrib/less/less.h
@@ -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
diff --git a/contrib/less/search.c b/contrib/less/search.c
index 030bdab7738b..ff00a311d300 100644
--- a/contrib/less/search.c
+++ b/contrib/less/search.c
@@ -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))
 		/*