===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/command.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- src/usr.bin/less/command.c	2017/01/12 20:32:01	1.31
+++ src/usr.bin/less/command.c	2019/09/03 23:08:42	1.32
@@ -19,7 +19,6 @@
 #include "position.h"
 
 extern int erase_char, erase2_char, kill_char;
-extern volatile sig_atomic_t sigs;
 extern int quit_if_one_screen;
 extern int less_is_more;
 extern int squished;
@@ -885,7 +884,7 @@
 	curr_len = ch_length();
 	highest_hilite = until_hilite ? curr_len : -1;
 	ignore_eoi = 1;
-	while (!sigs) {
+	while (!any_sigs()) {
 		if (until_hilite && highest_hilite > curr_len) {
 			ring_bell();
 			break;
@@ -900,7 +899,7 @@
 	 * This gets us back in "F mode" after processing
 	 * a non-abort signal (e.g. window-change).
 	 */
-	if (sigs && !ABORT_SIGS())
+	if (any_sigs() && !abort_sigs())
 		return (until_hilite ? A_F_UNTIL_HILITE : A_F_FOREVER);
 
 	return (A_NOACTION);
@@ -938,7 +937,7 @@
 		/*
 		 * See if any signals need processing.
 		 */
-		if (sigs) {
+		if (any_sigs()) {
 			psignals();
 			if (quitting)
 				quit(QUIT_SAVED_STATUS);
@@ -949,13 +948,13 @@
 		 */
 		cmd_reset();
 		prompt();
-		if (sigs)
+		if (any_sigs())
 			continue;
 		if (newaction == A_NOACTION)
 			c = getcc();
 
 again:
-		if (sigs)
+		if (any_sigs())
 			continue;
 
 		if (newaction != A_NOACTION) {