===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/line.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** src/usr.bin/less/line.c	2019/08/31 13:44:29	1.32
--- src/usr.bin/less/line.c	2019/09/03 23:08:42	1.33
***************
*** 46,52 ****
  static int attr_ewidth(int);
  static int do_append(LWCHAR, char *, off_t);
  
- extern volatile sig_atomic_t sigs;
  extern int bs_mode;
  extern int linenums;
  extern int ctldisp;
--- 46,51 ----
***************
*** 685,691 ****
  			mbc_buf[mbc_buf_index++] = c;
  			memset(&mbs, 0, sizeof(mbs));
  			sz = mbrtowc(&ch, mbc_buf, mbc_buf_index, &mbs);
! 			
  			/* Incomplete UTF-8: wait for more bytes. */
  			if (sz == (size_t)-2)
  				return (0);
--- 684,690 ----
  			mbc_buf[mbc_buf_index++] = c;
  			memset(&mbs, 0, sizeof(mbs));
  			sz = mbrtowc(&ch, mbc_buf, mbc_buf_index, &mbs);
! 
  			/* Incomplete UTF-8: wait for more bytes. */
  			if (sz == (size_t)-2)
  				return (0);
***************
*** 1034,1040 ****
  
  	n = 0;
  	for (;;) {
! 		if (c == '\n' || c == EOI || ABORT_SIGS()) {
  			new_pos = ch_tell();
  			break;
  		}
--- 1033,1039 ----
  
  	n = 0;
  	for (;;) {
! 		if (c == '\n' || c == EOI || abort_sigs()) {
  			new_pos = ch_tell();
  			break;
  		}
***************
*** 1077,1083 ****
  	linebuf[--n] = '\0';
  	for (;;) {
  		c = ch_back_get();
! 		if (c == '\n' || ABORT_SIGS()) {
  			/*
  			 * This is the newline ending the previous line.
  			 * We have hit the beginning of the line.
--- 1076,1082 ----
  	linebuf[--n] = '\0';
  	for (;;) {
  		c = ch_back_get();
! 		if (c == '\n' || abort_sigs()) {
  			/*
  			 * This is the newline ending the previous line.
  			 * We have hit the beginning of the line.