===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/line.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/less/line.c	2016/03/26 08:59:29	1.20
--- src/usr.bin/less/line.c	2016/09/17 15:06:41	1.21
***************
*** 181,187 ****
  		if (n < MIN_LINENUM_WIDTH)
  			n = MIN_LINENUM_WIDTH;
  		snprintf(linebuf+curr, size_linebuf-curr, "%*s ", n, buf);
! 		n++;  /* One space after the line number. */
  		for (i = 0; i < n; i++)
  			attr[curr+i] = AT_NORMAL;
  		curr += n;
--- 181,187 ----
  		if (n < MIN_LINENUM_WIDTH)
  			n = MIN_LINENUM_WIDTH;
  		snprintf(linebuf+curr, size_linebuf-curr, "%*s ", n, buf);
! 		n++;	/* One space after the line number. */
  		for (i = 0; i < n; i++)
  			attr[curr+i] = AT_NORMAL;
  		curr += n;
***************
*** 464,470 ****
  	 * Search backwards for either an ESC (which means we ARE in a seq);
  	 * or an end char (which means we're NOT in a seq).
  	 */
! 	for (p = &linebuf[curr];  p > linebuf; ) {
  		LWCHAR ch = step_char(&p, -1, linebuf);
  		if (IS_CSI_START(ch))
  			return (1);
--- 464,470 ----
  	 * Search backwards for either an ESC (which means we ARE in a seq);
  	 * or an end char (which means we're NOT in a seq).
  	 */
! 	for (p = &linebuf[curr]; p > linebuf; ) {
  		LWCHAR ch = step_char(&p, -1, linebuf);
  		if (IS_CSI_START(ch))
  			return (1);
***************
*** 596,602 ****
  		to_tab = tabdefault -
  		    ((to_tab - tabstops[ntabstops-1]) % tabdefault);
  	else {
! 		for (i = ntabstops - 2;  i >= 0;  i--)
  			if (to_tab >= tabstops[i])
  				break;
  		to_tab = tabstops[i+1] - to_tab;
--- 596,602 ----
  		to_tab = tabdefault -
  		    ((to_tab - tabstops[ntabstops-1]) % tabdefault);
  	else {
! 		for (i = ntabstops - 2; i >= 0; i--)
  			if (to_tab >= tabstops[i])
  				break;
  		to_tab = tabstops[i+1] - to_tab;