From unknown Fri Aug 15 14:16:31 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#31105 <31105@debbugs.gnu.org> To: bug#31105 <31105@debbugs.gnu.org> Subject: Status: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R Reply-To: bug#31105 <31105@debbugs.gnu.org> Date: Fri, 15 Aug 2025 21:16:31 +0000 retitle 31105 [PATCH] Restart and reset ANSI escapes on each line for compa= tibility with less -R reassign 31105 diffutils submitter 31105 "Dennis Lambe Jr." severity 31105 normal tag 31105 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 09 04:03:14 2018 Received: (at submit) by debbugs.gnu.org; 9 Apr 2018 08:03:14 +0000 Received: from localhost ([127.0.0.1]:43101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5Rli-0001SX-3K for submit@debbugs.gnu.org; Mon, 09 Apr 2018 04:03:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5KE3-0007LN-92 for submit@debbugs.gnu.org; Sun, 08 Apr 2018 19:59:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5KDw-00070d-Uq for submit@debbugs.gnu.org; Sun, 08 Apr 2018 19:59:54 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:33872) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f5KDw-00070W-QD for submit@debbugs.gnu.org; Sun, 08 Apr 2018 19:59:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5KDv-0008S9-6N for bug-diffutils@gnu.org; Sun, 08 Apr 2018 19:59:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5KDs-0006zE-3k for bug-diffutils@gnu.org; Sun, 08 Apr 2018 19:59:51 -0400 Received: from uofr.net ([50.116.51.30]:51434) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f5KDr-0006z0-Sq for bug-diffutils@gnu.org; Sun, 08 Apr 2018 19:59:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=uofr.net; s=selector-1; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:To:From:Date:Message-ID; bh=XSJnTBzfh9wk3+syF8drqtuvFz8+kvSDSd/bDTkFaeQ=; b=AgWxhw1e5YbAG8mHnGDwOXnRgQNmTeABRI7Bk76px3WG7L+/YcrgplSAbslY9rClsspmADn7YphmLb3aZ5MimgpMxiCcLgd8DqnUx8hEFpy2eTxHlpbggPZ0la4tuIFVjjd7rYcE/33X0ZqVRQ/rLdPGN50SvsELbL1Conoj6Hs=; Received: from localhost ([127.0.0.1]) by uofr.net with esmtp id 1f5KDb-0002uS-Gi for ; Sun, 08 Apr 2018 19:59:46 -0400 Received: from pool-108-7-201-76.bstnma.fios.verizon.net (pool-108-7-201-76.bstnma.fios.verizon.net [108.7.201.76]) by ssl.uofr.net (Horde Framework) with HTTP; Sun, 08 Apr 2018 19:59:31 -0400 Message-ID: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> Date: Sun, 08 Apr 2018 19:59:31 -0400 From: "Dennis Lambe Jr." To: bug-diffutils@gnu.org Subject: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_1dxcobmxktsz" Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.3) Received-SPF: none client-ip=127.0.0.1; envelope-from=malsyned@malsyned.net; helo=localhost X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Mon, 09 Apr 2018 04:03:12 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) This message is in MIME format. --=_1dxcobmxktsz Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit Hello! GNU less can display ANSI-colored text with the -R flag, but this support has some limitations. One of them is that if an escape sequence starts on one line and ends on a different line, only the first line will be colored in less. As a result, when diff creates colored output with multi-line deletes or adds, less will only color the first line. I've attached a patch to reset ANSI color to the default at the end of every line and restart it at the beginning of the next. It patches normal and context mode. Side-by-side already worked in my testing. I hope it's useful to you. Please let me know if there are changes you would like made before you can accept it. --Dennis Lambe Jr. --=_1dxcobmxktsz Content-Type: text/x-patch; charset=ISO-8859-1; name="99-color-escapes-every-line.patch" Content-Disposition: attachment; filename="99-color-escapes-every-line.patch" Content-Transfer-Encoding: quoted-printable --- a/src/normal.c +++ b/src/normal.c @@ -60,12 +60,11 @@ if (changes & OLD) { if (first0 <=3D last0) - set_color_context (DELETE_CONTEXT); for (i =3D first0; i <=3D last0; i++) { + set_color_context (DELETE_CONTEXT); print_1_line_nl ("<", &files[0].linbuf[i], true); - if (i =3D=3D last0) - set_color_context (RESET_CONTEXT); + set_color_context (RESET_CONTEXT); if (files[0].linbuf[i + 1][-1] =3D=3D '\n') putc ('\n', outfile); } @@ -77,13 +76,11 @@ /* Print the lines that the second file has. */ if (changes & NEW) { - if (first1 <=3D last1) - set_color_context (ADD_CONTEXT); for (i =3D first1; i <=3D last1; i++) { + set_color_context (ADD_CONTEXT); print_1_line_nl (">", &files[1].linbuf[i], true); - if (i =3D=3D last1) - set_color_context (RESET_CONTEXT); + set_color_context (RESET_CONTEXT); if (files[1].linbuf[i + 1][-1] =3D=3D '\n') putc ('\n', outfile); } --- a/src/context.c +++ b/src/context.c @@ -43,8 +43,11 @@ =09=09 char const *name, =09=09 char const *label) { + set_color_context (HEADER_CONTEXT); if (label) - fprintf (outfile, "%s %s\n", mark, label); + { + fprintf (outfile, "%s %s", mark, label); + } else { char buf[MAX (INT_STRLEN_BOUND (int) + 32, @@ -71,8 +74,10 @@ =09 sprintf (buf, "%"PRIuMAX".%.9d", sec, nsec); =09 } =09} - fprintf (outfile, "%s %s\t%s\n", mark, name, buf); + fprintf (outfile, "%s %s\t%s", mark, name, buf); } + set_color_context (RESET_CONTEXT); + fprintf (outfile, "\n"); } =20 /* Print a header for a context diff, with the file names and dates. */ @@ -80,7 +85,6 @@ void print_context_header (struct file_data inf[], char const *const *names, boo= l unidiff) { - set_color_context (HEADER_CONTEXT); if (unidiff) { print_context_label ("---", &inf[0], names[0], file_label[0]); @@ -91,7 +95,6 @@ print_context_label ("***", &inf[0], names[0], file_label[0]); print_context_label ("---", &inf[1], names[1], file_label[1]); } - set_color_context (RESET_CONTEXT); } =20 /* Print an edit script in context format. */ @@ -219,11 +222,10 @@ { struct change *next =3D hunk; =20 - if (first0 <=3D last0) - set_color_context (DELETE_CONTEXT); - for (i =3D first0; i <=3D last0; i++) =09{ + set_color_context (DELETE_CONTEXT); + =09 /* Skip past changes that apply (in file 0) =09 only to lines before line I. */ =20 @@ -241,8 +243,7 @@ prefix =3D (next->inserted > 0 ? "!" : "-"); } =09 print_1_line_nl (prefix, &files[0].linbuf[i], true); - if (i =3D=3D last0) - set_color_context (RESET_CONTEXT); + set_color_context (RESET_CONTEXT); if (files[0].linbuf[i + 1][-1] =3D=3D '\n') putc ('\n', out); =09} @@ -259,11 +260,10 @@ { struct change *next =3D hunk; =20 - if (first1 <=3D last1) - set_color_context (ADD_CONTEXT); - for (i =3D first1; i <=3D last1; i++) =09{ + set_color_context (ADD_CONTEXT); + =09 /* Skip past changes that apply (in file 1) =09 only to lines before line I. */ =20 @@ -281,8 +281,7 @@ prefix =3D (next->deleted > 0 ? "!" : "+"); } =09 print_1_line_nl (prefix, &files[1].linbuf[i], true); - if (i =3D=3D last1) - set_color_context (RESET_CONTEXT); +=09 set_color_context (RESET_CONTEXT); if (files[1].linbuf[i + 1][-1] =3D=3D '\n') putc ('\n', out); =09} @@ -390,19 +389,17 @@ =09 /* For each difference, first output the deleted part. */ =20 =09 k =3D next->deleted; - if (k) - set_color_context (DELETE_CONTEXT); =20 =09 while (k--) =09 { =09 char const * const *line =3D &files[0].linbuf[i++]; + set_color_context (DELETE_CONTEXT); =09 putc ('-', out); =09 if (initial_tab && ! (suppress_blank_empty && **line =3D=3D '\n')) =09=09putc ('\t', out); =09 print_1_line_nl (NULL, line, true); =20 - if (!k) - set_color_context (RESET_CONTEXT); +=09 set_color_context (RESET_CONTEXT); =20 if (line[1][-1] =3D=3D '\n') putc ('\n', out); @@ -411,19 +408,17 @@ =09 /* Then output the inserted part. */ =20 =09 k =3D next->inserted; - if (k) - set_color_context (ADD_CONTEXT); =20 while (k--) =09 { =09 char const * const *line =3D &files[1].linbuf[j++]; + set_color_context (ADD_CONTEXT); =09 putc ('+', out); =09 if (initial_tab && ! (suppress_blank_empty && **line =3D=3D '\n')) =09=09putc ('\t', out); =09 print_1_line_nl (NULL, line, true); =20 - if (!k) - set_color_context (RESET_CONTEXT); +=09 set_color_context (RESET_CONTEXT); =20 if (line[1][-1] =3D=3D '\n') putc ('\n', out); --- a/tests/colors +++ b/tests/colors @@ -25,9 +25,9 @@ local de=3D$(printf "$e[${de}m") local ln=3D$(printf "$e[${ln}m") printf '%s' \ -"$hd--- a$tab$epoch_plus -+++ b$tab$epoch_plus -$rs${ln}@@ -1 +1 @@$rs +"$hd--- a$tab$epoch_plus$rs +$hd+++ b$tab$epoch_plus$rs +${ln}@@ -1 +1 @@$rs $de-a$rs $ad+b$rs " @@ -42,9 +42,9 @@ local de=3D$(printf "$e[${de}m") local ln=3D$(printf "$e[${ln}m") printf '%s' \ -"$hd*** a$tab$epoch_posix_1003_1_2001 ---- b$tab$epoch_posix_1003_1_2001 -$rs*************** +"$hd*** a$tab$epoch_posix_1003_1_2001$rs +$hd--- b$tab$epoch_posix_1003_1_2001$rs +*************** $ln*** 1 ****$rs $de! a$rs $ln--- 1 ----$rs --=_1dxcobmxktsz-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 09 15:00:25 2018 Received: (at submit) by debbugs.gnu.org; 9 Apr 2018 19:00:25 +0000 Received: from localhost ([127.0.0.1]:44251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5c1g-0006Ez-Kl for submit@debbugs.gnu.org; Mon, 09 Apr 2018 15:00:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5Z7A-0008QM-2h for submit@debbugs.gnu.org; Mon, 09 Apr 2018 11:53:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5Z6y-0008Jy-KX for submit@debbugs.gnu.org; Mon, 09 Apr 2018 11:53:46 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:46531) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f5Z6y-0008JV-Et for submit@debbugs.gnu.org; Mon, 09 Apr 2018 11:53:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5Z6w-00052N-OO for bug-diffutils@gnu.org; Mon, 09 Apr 2018 11:53:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5Z6r-0008FP-SD for bug-diffutils@gnu.org; Mon, 09 Apr 2018 11:53:38 -0400 Received: from uofr.net ([50.116.51.30]:56560) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f5Z6r-0008EY-Js for bug-diffutils@gnu.org; Mon, 09 Apr 2018 11:53:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=uofr.net; s=selector-1; h=Content-Transfer-Encoding:Content-Type:MIME-Version:In-Reply-To:References:Subject:To:From:Date:Message-ID; bh=Ig2wA7BWHvY13fqwzI3fSQy6Ap+MfwqR9TpycZq0SdY=; b=esEfv5b8PxsuMhyW49msXEJ4VRgFjGRKcrNpnPu8zkQB2yLSoo/MUEcnLWZEoDI9GkLPjFFWsTXAxFAXdL53bX4F6va6K3uiC4G3DNn2Xi0Qrmlf4gXq7uCHfo+6MlWNFcJOrmbHyAA+f1Viv2z7GyTmFjjqdQgGTuTUf5ucxyo=; Received: from localhost ([127.0.0.1]) by uofr.net with esmtp id 1f5Z6b-0002QG-MB for ; Mon, 09 Apr 2018 11:53:32 -0400 Received: from pool-108-7-201-76.bstnma.fios.verizon.net (pool-108-7-201-76.bstnma.fios.verizon.net [108.7.201.76]) by ssl.uofr.net (Horde Framework) with HTTP; Mon, 09 Apr 2018 11:53:17 -0400 Message-ID: <20180409115317.54022sqdbsktmzxp@ssl.uofr.net> Date: Mon, 09 Apr 2018 11:53:17 -0400 From: "Dennis Lambe Jr." To: bug-diffutils@gnu.org Subject: Re: [bug-diffutils] bug#31105: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> In-Reply-To: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_2ns280tq5vfx" Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.3) Received-SPF: none client-ip=127.0.0.1; envelope-from=malsyned@malsyned.net; helo=localhost X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Mon, 09 Apr 2018 15:00:23 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) This message is in MIME format. --=_2ns280tq5vfx Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The previous patch had an error in the first hunk for normal.c. I =20 forgot to remove an "if" line when I removed the following conditional =20 line. Due to its placement before a "for" line that tested the same =20 condition, it didn't affect the behavior of the patch, but it was =20 unsightly. I've attached an updated patch. Quoting "Dennis Lambe Jr." : > Hello! > > GNU less can display ANSI-colored text with the -R flag, but this =20 > support has some limitations. One of them is that if an escape =20 > sequence starts on one line and ends on a different line, only the =20 > first line will be colored in less. > > As a result, when diff creates colored output with multi-line =20 > deletes or adds, less will only color the first line. > > I've attached a patch to reset ANSI color to the default at the end =20 > of every line and restart it at the beginning of the next. It =20 > patches normal and context mode. Side-by-side already worked in my =20 > testing. > > I hope it's useful to you. Please let me know if there are changes =20 > you would like made before you can accept it. > > --Dennis Lambe Jr. > --=_2ns280tq5vfx Content-Type: text/x-patch; charset=ISO-8859-1; name="99-color-escapes-every-line-v2.patch" Content-Disposition: attachment; filename="99-color-escapes-every-line-v2.patch" Content-Transfer-Encoding: quoted-printable diff --git a/src/context.c b/src/context.c index 4dd882d..c8de512 100644 --- a/src/context.c +++ b/src/context.c @@ -43,8 +43,11 @@ print_context_label (char const *mark, =09=09 char const *name, =09=09 char const *label) { + set_color_context (HEADER_CONTEXT); if (label) - fprintf (outfile, "%s %s\n", mark, label); + { + fprintf (outfile, "%s %s", mark, label); + } else { char buf[MAX (INT_STRLEN_BOUND (int) + 32, @@ -71,8 +74,10 @@ print_context_label (char const *mark, =09 sprintf (buf, "%"PRIuMAX".%.9d", sec, nsec); =09 } =09} - fprintf (outfile, "%s %s\t%s\n", mark, name, buf); + fprintf (outfile, "%s %s\t%s", mark, name, buf); } + set_color_context (RESET_CONTEXT); + fprintf (outfile, "\n"); } =20 /* Print a header for a context diff, with the file names and dates. */ @@ -80,7 +85,6 @@ print_context_label (char const *mark, void print_context_header (struct file_data inf[], char const *const *names, boo= l unidiff) { - set_color_context (HEADER_CONTEXT); if (unidiff) { print_context_label ("---", &inf[0], names[0], file_label[0]); @@ -91,7 +95,6 @@ print_context_header (struct file_data inf[], char const *= const *names, bool uni print_context_label ("***", &inf[0], names[0], file_label[0]); print_context_label ("---", &inf[1], names[1], file_label[1]); } - set_color_context (RESET_CONTEXT); } =20 /* Print an edit script in context format. */ @@ -219,11 +222,10 @@ pr_context_hunk (struct change *hunk) { struct change *next =3D hunk; =20 - if (first0 <=3D last0) - set_color_context (DELETE_CONTEXT); - for (i =3D first0; i <=3D last0; i++) =09{ + set_color_context (DELETE_CONTEXT); + =09 /* Skip past changes that apply (in file 0) =09 only to lines before line I. */ =20 @@ -241,8 +243,7 @@ pr_context_hunk (struct change *hunk) prefix =3D (next->inserted > 0 ? "!" : "-"); } =09 print_1_line_nl (prefix, &files[0].linbuf[i], true); - if (i =3D=3D last0) - set_color_context (RESET_CONTEXT); + set_color_context (RESET_CONTEXT); if (files[0].linbuf[i + 1][-1] =3D=3D '\n') putc ('\n', out); =09} @@ -259,11 +260,10 @@ pr_context_hunk (struct change *hunk) { struct change *next =3D hunk; =20 - if (first1 <=3D last1) - set_color_context (ADD_CONTEXT); - for (i =3D first1; i <=3D last1; i++) =09{ + set_color_context (ADD_CONTEXT); + =09 /* Skip past changes that apply (in file 1) =09 only to lines before line I. */ =20 @@ -281,8 +281,7 @@ pr_context_hunk (struct change *hunk) prefix =3D (next->deleted > 0 ? "!" : "+"); } =09 print_1_line_nl (prefix, &files[1].linbuf[i], true); - if (i =3D=3D last1) - set_color_context (RESET_CONTEXT); +=09 set_color_context (RESET_CONTEXT); if (files[1].linbuf[i + 1][-1] =3D=3D '\n') putc ('\n', out); =09} @@ -390,19 +389,17 @@ pr_unidiff_hunk (struct change *hunk) =09 /* For each difference, first output the deleted part. */ =20 =09 k =3D next->deleted; - if (k) - set_color_context (DELETE_CONTEXT); =20 =09 while (k--) =09 { =09 char const * const *line =3D &files[0].linbuf[i++]; + set_color_context (DELETE_CONTEXT); =09 putc ('-', out); =09 if (initial_tab && ! (suppress_blank_empty && **line =3D=3D '\n')) =09=09putc ('\t', out); =09 print_1_line_nl (NULL, line, true); =20 - if (!k) - set_color_context (RESET_CONTEXT); +=09 set_color_context (RESET_CONTEXT); =20 if (line[1][-1] =3D=3D '\n') putc ('\n', out); @@ -411,19 +408,17 @@ pr_unidiff_hunk (struct change *hunk) =09 /* Then output the inserted part. */ =20 =09 k =3D next->inserted; - if (k) - set_color_context (ADD_CONTEXT); =20 while (k--) =09 { =09 char const * const *line =3D &files[1].linbuf[j++]; + set_color_context (ADD_CONTEXT); =09 putc ('+', out); =09 if (initial_tab && ! (suppress_blank_empty && **line =3D=3D '\n')) =09=09putc ('\t', out); =09 print_1_line_nl (NULL, line, true); =20 - if (!k) - set_color_context (RESET_CONTEXT); +=09 set_color_context (RESET_CONTEXT); =20 if (line[1][-1] =3D=3D '\n') putc ('\n', out); diff --git a/src/normal.c b/src/normal.c index c6aac07..bdb718b 100644 --- a/src/normal.c +++ b/src/normal.c @@ -59,13 +59,11 @@ print_normal_hunk (struct change *hunk) /* Print the lines that the first file has. */ if (changes & OLD) { - if (first0 <=3D last0) - set_color_context (DELETE_CONTEXT); for (i =3D first0; i <=3D last0; i++) { + set_color_context (DELETE_CONTEXT); print_1_line_nl ("<", &files[0].linbuf[i], true); - if (i =3D=3D last0) - set_color_context (RESET_CONTEXT); + set_color_context (RESET_CONTEXT); if (files[0].linbuf[i + 1][-1] =3D=3D '\n') putc ('\n', outfile); } @@ -77,13 +75,11 @@ print_normal_hunk (struct change *hunk) /* Print the lines that the second file has. */ if (changes & NEW) { - if (first1 <=3D last1) - set_color_context (ADD_CONTEXT); for (i =3D first1; i <=3D last1; i++) { + set_color_context (ADD_CONTEXT); print_1_line_nl (">", &files[1].linbuf[i], true); - if (i =3D=3D last1) - set_color_context (RESET_CONTEXT); + set_color_context (RESET_CONTEXT); if (files[1].linbuf[i + 1][-1] =3D=3D '\n') putc ('\n', outfile); } diff --git a/tests/colors b/tests/colors index f0f6246..5363cd8 100755 --- a/tests/colors +++ b/tests/colors @@ -25,9 +25,9 @@ gen_exp_u() local de=3D$(printf "$e[${de}m") local ln=3D$(printf "$e[${ln}m") printf '%s' \ -"$hd--- a$tab$epoch_plus -+++ b$tab$epoch_plus -$rs${ln}@@ -1 +1 @@$rs +"$hd--- a$tab$epoch_plus$rs +$hd+++ b$tab$epoch_plus$rs +${ln}@@ -1 +1 @@$rs $de-a$rs $ad+b$rs " @@ -42,9 +42,9 @@ gen_exp_c() local de=3D$(printf "$e[${de}m") local ln=3D$(printf "$e[${ln}m") printf '%s' \ -"$hd*** a$tab$epoch_posix_1003_1_2001 ---- b$tab$epoch_posix_1003_1_2001 -$rs*************** +"$hd*** a$tab$epoch_posix_1003_1_2001$rs +$hd--- b$tab$epoch_posix_1003_1_2001$rs +*************** $ln*** 1 ****$rs $de! a$rs $ln--- 1 ----$rs --=_2ns280tq5vfx-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 29 16:13:57 2018 Received: (at 31105) by debbugs.gnu.org; 29 Dec 2018 21:13:58 +0000 Received: from localhost ([127.0.0.1]:41667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdLvh-0004nM-In for submit@debbugs.gnu.org; Sat, 29 Dec 2018 16:13:57 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdLve-0004n8-JC for 31105@debbugs.gnu.org; Sat, 29 Dec 2018 16:13:55 -0500 Received: by mail-wr1-f68.google.com with SMTP id x10so23729806wrs.8 for <31105@debbugs.gnu.org>; Sat, 29 Dec 2018 13:13:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=KPMPYLBryu0L5ZuWVM9LwVWbbiPSTtQlCp1j2QBzsKo=; b=hgOqHUUatCksg9UfgD8yFbMMo1lkVKFv3ubpTyJ6rQ4j4HhVVo6waPsq2m7UyNTfwk 5MeFZDl8Y2qA9974ZNg6JSE3erJS6GtNduN639ygAkPHyPvzc79bHHcqIOQxcwrMVDNx 4JfN+ko4sItyKGzmilayVOsmXU9Eyn2fpSB6ji8L6w+o1GfGJb+eGNDnxt3ei3/AwK0g iwfXht9oi2uGcPntFYj6BPDN6OqpeZhsHiMmy5w24oFo2poET0HBjThE7IQ0xBCEDiHH JkEaunWyi7kQYm6kQjN/ndkkAw2u+QNM+TOjTu5tJJ8Ltfbm9ZX3uOxPWS0QQil01kAN fXfg== X-Gm-Message-State: AJcUukdMolZVzJwTC+suhx7i+h++HBo5BW84otTmybKiMednXGBYdzz2 6+3trIgjBJUBW5wd1adRI5rmmcWtEGFMtjVGlaSITvac X-Google-Smtp-Source: ALg8bN5JeOJivVx8xebY/En6ggJb04vgZ/ejsOMpkW6QCHxY7X/yoO9TVNHyQLCE4K5gTxEUlyNpEmoqoqATPWrw1CY= X-Received: by 2002:adf:9422:: with SMTP id 31mr30795914wrq.106.1546118028849; Sat, 29 Dec 2018 13:13:48 -0800 (PST) MIME-Version: 1.0 References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> <20180409115317.54022sqdbsktmzxp@ssl.uofr.net> In-Reply-To: <20180409115317.54022sqdbsktmzxp@ssl.uofr.net> From: Jim Meyering Date: Sat, 29 Dec 2018 13:13:37 -0800 Message-ID: Subject: Re: [bug-diffutils] bug#31105: bug#31105: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R To: "Dennis Lambe Jr." Content-Type: multipart/mixed; boundary="000000000000e413b8057e2fa797" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31105 Cc: 31105@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000e413b8057e2fa797 Content-Type: text/plain; charset="UTF-8" On Mon, Apr 9, 2018 at 12:02 PM Dennis Lambe Jr. wrote: > > The previous patch had an error in the first hunk for normal.c. I > forgot to remove an "if" line when I removed the following conditional > line. Due to its placement before a "for" line that tested the same > condition, it didn't affect the behavior of the patch, but it was > unsightly. I've attached an updated patch. > > Quoting "Dennis Lambe Jr." : > > > Hello! > > > > GNU less can display ANSI-colored text with the -R flag, but this > > support has some limitations. One of them is that if an escape > > sequence starts on one line and ends on a different line, only the > > first line will be colored in less. > > > > As a result, when diff creates colored output with multi-line > > deletes or adds, less will only color the first line. > > > > I've attached a patch to reset ANSI color to the default at the end > > of every line and restart it at the beginning of the next. It > > patches normal and context mode. Side-by-side already worked in my > > testing. > > > > I hope it's useful to you. Please let me know if there are changes > > you would like made before you can accept it. Thank you for the contribution. I've written a ChangeLog entry for you and attached a rebased commit. However, the change is large enough that we'll also need a copyright assignment from you. Can you do that? Here are instructions: https://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/Copyright/request-assign.changes --000000000000e413b8057e2fa797 Content-Type: application/octet-stream; name="ansi-reset-less.diff" Content-Disposition: attachment; filename="ansi-reset-less.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jq9yqt0o0 RnJvbSBiODhkMzA5MGE2NDkxOGFmYzNkMGIxOTFiNzRlMjU1ODhmMDhjZDNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEZW5uaXMgTGFtYmUgSnIgPG1hbHN5bmVkQG1hbHN5bmVkLm5l dD4KRGF0ZTogU2F0LCAyOSBEZWMgMjAxOCAxMzowNDoxMCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hd IGRpZmY6IGFkanVzdCBBTlNJIGVzY2FwZXMgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBsZXNzIC1S CgpHTlUgbGVzcyBjYW4gZGlzcGxheSBBTlNJLWNvbG9yZWQgdGV4dCB3aXRoIHRoZSAtUiBmbGFn LCBidXQgdGhpcwpzdXBwb3J0IGhhcyBzb21lIGxpbWl0YXRpb25zLiBPbmUgb2YgdGhlbSBpcyB0 aGF0IGlmIGFuIGVzY2FwZQpzZXF1ZW5jZSBzdGFydHMgb24gb25lIGxpbmUgYW5kIGVuZHMgb24g YSBkaWZmZXJlbnQgbGluZSwgb25seSB0aGUKZmlyc3QgbGluZSB3aWxsIGJlIGNvbG9yZWQgaW4g bGVzcy4KCkFzIGEgcmVzdWx0LCB3aGVuIGRpZmYgY3JlYXRlcyBjb2xvcmVkIG91dHB1dCB3aXRo IG11bHRpLWxpbmUgZGVsZXRlcwpvciBhZGRzLCBsZXNzIHdpbGwgb25seSBjb2xvciB0aGUgZmly c3QgbGluZS4KClRoaXMgY2hhbmdlIHJlc2V0cyBBTlNJIGNvbG9yIHRvIHRoZSBkZWZhdWx0IGF0 IHRoZSBlbmQgb2YKZWFjaCBsaW5lIGFuZCByZXN0YXJ0cyBpdCBhdCB0aGUgYmVnaW5uaW5nIG9m IHRoZSBuZXh0LiBJdCBwYXRjaGVzCm5vcm1hbCBhbmQgY29udGV4dCBtb2RlLiBTaWRlLWJ5LXNp ZGUgYWxyZWFkeSB3b3JrZWQgaW4gbXkgdGVzdGluZy4KKiBzcmMvY29udGV4dC5jIChwcmludF9j b250ZXh0X2xhYmVsLCBwcl9jb250ZXh0X2h1bmspOiBBcyBhYm92ZS4KKHByX3VuaWRpZmZfaHVu aywgcHJpbnRfY29udGV4dF9oZWFkZXIpOiBMaWtld2lzZS4KKiBzcmMvbm9ybWFsLmMgKHByaW50 X25vcm1hbF9odW5rKTogTGlrZXdpc2UuCiogdGVzdHMvY29sb3JzOiBBZGp1c3QgZXhpc3Rpbmcg dGVzdHMgdG8gYWNjb21tb2RhdGUgdGhpcy4KaHR0cDovL2J1Z3MuZ251Lm9yZy8zMTEwNQotLS0K IHNyYy9jb250ZXh0LmMgfCAzOSArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIHNyYy9ub3JtYWwuYyAgfCAxMiArKysrLS0tLS0tLS0KIHRlc3RzL2NvbG9ycyAgfCAxMiAr KysrKystLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMzYgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2NvbnRleHQuYyBiL3NyYy9jb250ZXh0LmMKaW5kZXgg NGRkODgyZC4uYzhkZTUxMiAxMDA2NDQKLS0tIGEvc3JjL2NvbnRleHQuYworKysgYi9zcmMvY29u dGV4dC5jCkBAIC00Myw4ICs0MywxMSBAQCBwcmludF9jb250ZXh0X2xhYmVsIChjaGFyIGNvbnN0 ICptYXJrLAogCQkgICAgIGNoYXIgY29uc3QgKm5hbWUsCiAJCSAgICAgY2hhciBjb25zdCAqbGFi ZWwpCiB7CisgIHNldF9jb2xvcl9jb250ZXh0IChIRUFERVJfQ09OVEVYVCk7CiAgIGlmIChsYWJl bCkKLSAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXNcbiIsIG1hcmssIGxhYmVsKTsKKyAgICB7 CisgICAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXMiLCBtYXJrLCBsYWJlbCk7CisgICAgfQog ICBlbHNlCiAgICAgewogICAgICAgY2hhciBidWZbTUFYIChJTlRfU1RSTEVOX0JPVU5EIChpbnQp ICsgMzIsCkBAIC03MSw4ICs3NCwxMCBAQCBwcmludF9jb250ZXh0X2xhYmVsIChjaGFyIGNvbnN0 ICptYXJrLAogCSAgICAgIHNwcmludGYgKGJ1ZiwgIiUiUFJJdU1BWCIuJS45ZCIsIHNlYywgbnNl Yyk7CiAJICAgIH0KIAl9Ci0gICAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXNcdCVzXG4iLCBt YXJrLCBuYW1lLCBidWYpOworICAgICAgZnByaW50ZiAob3V0ZmlsZSwgIiVzICVzXHQlcyIsIG1h cmssIG5hbWUsIGJ1Zik7CiAgICAgfQorICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVY VCk7CisgIGZwcmludGYgKG91dGZpbGUsICJcbiIpOwogfQoKIC8qIFByaW50IGEgaGVhZGVyIGZv ciBhIGNvbnRleHQgZGlmZiwgd2l0aCB0aGUgZmlsZSBuYW1lcyBhbmQgZGF0ZXMuICAqLwpAQCAt ODAsNyArODUsNiBAQCBwcmludF9jb250ZXh0X2xhYmVsIChjaGFyIGNvbnN0ICptYXJrLAogdm9p ZAogcHJpbnRfY29udGV4dF9oZWFkZXIgKHN0cnVjdCBmaWxlX2RhdGEgaW5mW10sIGNoYXIgY29u c3QgKmNvbnN0ICpuYW1lcywgYm9vbCB1bmlkaWZmKQogewotICBzZXRfY29sb3JfY29udGV4dCAo SEVBREVSX0NPTlRFWFQpOwogICBpZiAodW5pZGlmZikKICAgICB7CiAgICAgICBwcmludF9jb250 ZXh0X2xhYmVsICgiLS0tIiwgJmluZlswXSwgbmFtZXNbMF0sIGZpbGVfbGFiZWxbMF0pOwpAQCAt OTEsNyArOTUsNiBAQCBwcmludF9jb250ZXh0X2hlYWRlciAoc3RydWN0IGZpbGVfZGF0YSBpbmZb XSwgY2hhciBjb25zdCAqY29uc3QgKm5hbWVzLCBib29sIHVuaQogICAgICAgcHJpbnRfY29udGV4 dF9sYWJlbCAoIioqKiIsICZpbmZbMF0sIG5hbWVzWzBdLCBmaWxlX2xhYmVsWzBdKTsKICAgICAg IHByaW50X2NvbnRleHRfbGFiZWwgKCItLS0iLCAmaW5mWzFdLCBuYW1lc1sxXSwgZmlsZV9sYWJl bFsxXSk7CiAgICAgfQotICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CiB9Cgog LyogUHJpbnQgYW4gZWRpdCBzY3JpcHQgaW4gY29udGV4dCBmb3JtYXQuICAqLwpAQCAtMjE5LDEx ICsyMjIsMTAgQEAgcHJfY29udGV4dF9odW5rIChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAgIHsK ICAgICAgIHN0cnVjdCBjaGFuZ2UgKm5leHQgPSBodW5rOwoKLSAgICAgIGlmIChmaXJzdDAgPD0g bGFzdDApCi0gICAgICAgIHNldF9jb2xvcl9jb250ZXh0IChERUxFVEVfQ09OVEVYVCk7Ci0KICAg ICAgIGZvciAoaSA9IGZpcnN0MDsgaSA8PSBsYXN0MDsgaSsrKQogCXsKKyAgICAgICAgICBzZXRf Y29sb3JfY29udGV4dCAoREVMRVRFX0NPTlRFWFQpOworCiAJICAvKiBTa2lwIHBhc3QgY2hhbmdl cyB0aGF0IGFwcGx5IChpbiBmaWxlIDApCiAJICAgICBvbmx5IHRvIGxpbmVzIGJlZm9yZSBsaW5l IEkuICAqLwoKQEAgLTI0MSw4ICsyNDMsNyBAQCBwcl9jb250ZXh0X2h1bmsgKHN0cnVjdCBjaGFu Z2UgKmh1bmspCiAgICAgICAgICAgICAgIHByZWZpeCA9IChuZXh0LT5pbnNlcnRlZCA+IDAgPyAi ISIgOiAiLSIpOwogICAgICAgICAgICAgfQogCSAgcHJpbnRfMV9saW5lX25sIChwcmVmaXgsICZm aWxlc1swXS5saW5idWZbaV0sIHRydWUpOwotICAgICAgICAgIGlmIChpID09IGxhc3QwKQotICAg ICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRFWFQpOworICAgICAgICAgIHNl dF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKICAgICAgICAgICBpZiAoZmlsZXNbMF0u bGluYnVmW2kgKyAxXVstMV0gPT0gJ1xuJykKICAgICAgICAgICAgIHB1dGMgKCdcbicsIG91dCk7 CiAJfQpAQCAtMjU5LDExICsyNjAsMTAgQEAgcHJfY29udGV4dF9odW5rIChzdHJ1Y3QgY2hhbmdl ICpodW5rKQogICAgIHsKICAgICAgIHN0cnVjdCBjaGFuZ2UgKm5leHQgPSBodW5rOwoKLSAgICAg IGlmIChmaXJzdDEgPD0gbGFzdDEpCi0gICAgICAgIHNldF9jb2xvcl9jb250ZXh0IChBRERfQ09O VEVYVCk7Ci0KICAgICAgIGZvciAoaSA9IGZpcnN0MTsgaSA8PSBsYXN0MTsgaSsrKQogCXsKKyAg ICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NPTlRFWFQpOworCiAJICAvKiBTa2lwIHBh c3QgY2hhbmdlcyB0aGF0IGFwcGx5IChpbiBmaWxlIDEpCiAJICAgICBvbmx5IHRvIGxpbmVzIGJl Zm9yZSBsaW5lIEkuICAqLwoKQEAgLTI4MSw4ICsyODEsNyBAQCBwcl9jb250ZXh0X2h1bmsgKHN0 cnVjdCBjaGFuZ2UgKmh1bmspCiAgICAgICAgICAgICAgIHByZWZpeCA9IChuZXh0LT5kZWxldGVk ID4gMCA/ICIhIiA6ICIrIik7CiAgICAgICAgICAgICB9CiAJICBwcmludF8xX2xpbmVfbmwgKHBy ZWZpeCwgJmZpbGVzWzFdLmxpbmJ1ZltpXSwgdHJ1ZSk7Ci0gICAgICAgICAgaWYgKGkgPT0gbGFz dDEpCi0gICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CisJICBz ZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CiAgICAgICAgICAgaWYgKGZpbGVzWzFd LmxpbmJ1ZltpICsgMV1bLTFdID09ICdcbicpCiAgICAgICAgICAgICBwdXRjICgnXG4nLCBvdXQp OwogCX0KQEAgLTM5MCwxOSArMzg5LDE3IEBAIHByX3VuaWRpZmZfaHVuayAoc3RydWN0IGNoYW5n ZSAqaHVuaykKIAkgIC8qIEZvciBlYWNoIGRpZmZlcmVuY2UsIGZpcnN0IG91dHB1dCB0aGUgZGVs ZXRlZCBwYXJ0LiAqLwoKIAkgIGsgPSBuZXh0LT5kZWxldGVkOwotICAgICAgICAgIGlmIChrKQot ICAgICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKERFTEVURV9DT05URVhUKTsKCiAJICB3aGls ZSAoay0tKQogCSAgICB7CiAJICAgICAgY2hhciBjb25zdCAqIGNvbnN0ICpsaW5lID0gJmZpbGVz WzBdLmxpbmJ1ZltpKytdOworICAgICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoREVMRVRF X0NPTlRFWFQpOwogCSAgICAgIHB1dGMgKCctJywgb3V0KTsKIAkgICAgICBpZiAoaW5pdGlhbF90 YWIgJiYgISAoc3VwcHJlc3NfYmxhbmtfZW1wdHkgJiYgKipsaW5lID09ICdcbicpKQogCQlwdXRj ICgnXHQnLCBvdXQpOwogCSAgICAgIHByaW50XzFfbGluZV9ubCAoTlVMTCwgbGluZSwgdHJ1ZSk7 CgotICAgICAgICAgICAgICBpZiAoIWspCi0gICAgICAgICAgICAgICAgc2V0X2NvbG9yX2NvbnRl eHQgKFJFU0VUX0NPTlRFWFQpOworCSAgICAgIHNldF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05U RVhUKTsKCiAgICAgICAgICAgICAgIGlmIChsaW5lWzFdWy0xXSA9PSAnXG4nKQogICAgICAgICAg ICAgICAgIHB1dGMgKCdcbicsIG91dCk7CkBAIC00MTEsMTkgKzQwOCwxNyBAQCBwcl91bmlkaWZm X2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAJICAvKiBUaGVuIG91dHB1dCB0aGUgaW5zZXJ0 ZWQgcGFydC4gKi8KCiAJICBrID0gbmV4dC0+aW5zZXJ0ZWQ7Ci0gICAgICAgICAgaWYgKGspCi0g ICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NPTlRFWFQpOwoKICAgICAgICAgICB3 aGlsZSAoay0tKQogCSAgICB7CiAJICAgICAgY2hhciBjb25zdCAqIGNvbnN0ICpsaW5lID0gJmZp bGVzWzFdLmxpbmJ1ZltqKytdOworICAgICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoQURE X0NPTlRFWFQpOwogCSAgICAgIHB1dGMgKCcrJywgb3V0KTsKIAkgICAgICBpZiAoaW5pdGlhbF90 YWIgJiYgISAoc3VwcHJlc3NfYmxhbmtfZW1wdHkgJiYgKipsaW5lID09ICdcbicpKQogCQlwdXRj ICgnXHQnLCBvdXQpOwogCSAgICAgIHByaW50XzFfbGluZV9ubCAoTlVMTCwgbGluZSwgdHJ1ZSk7 CgotICAgICAgICAgICAgICBpZiAoIWspCi0gICAgICAgICAgICAgICAgc2V0X2NvbG9yX2NvbnRl eHQgKFJFU0VUX0NPTlRFWFQpOworCSAgICAgIHNldF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05U RVhUKTsKCiAgICAgICAgICAgICAgIGlmIChsaW5lWzFdWy0xXSA9PSAnXG4nKQogICAgICAgICAg ICAgICAgIHB1dGMgKCdcbicsIG91dCk7CmRpZmYgLS1naXQgYS9zcmMvbm9ybWFsLmMgYi9zcmMv bm9ybWFsLmMKaW5kZXggYzZhYWMwNy4uYmRiNzE4YiAxMDA2NDQKLS0tIGEvc3JjL25vcm1hbC5j CisrKyBiL3NyYy9ub3JtYWwuYwpAQCAtNTksMTMgKzU5LDExIEBAIHByaW50X25vcm1hbF9odW5r IChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAvKiBQcmludCB0aGUgbGluZXMgdGhhdCB0aGUgZmly c3QgZmlsZSBoYXMuICAqLwogICBpZiAoY2hhbmdlcyAmIE9MRCkKICAgICB7Ci0gICAgICBpZiAo Zmlyc3QwIDw9IGxhc3QwKQotICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoREVMRVRFX0NPTlRF WFQpOwogICAgICAgZm9yIChpID0gZmlyc3QwOyBpIDw9IGxhc3QwOyBpKyspCiAgICAgICAgIHsK KyAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoREVMRVRFX0NPTlRFWFQpOwogICAgICAgICAg IHByaW50XzFfbGluZV9ubCAoIjwiLCAmZmlsZXNbMF0ubGluYnVmW2ldLCB0cnVlKTsKLSAgICAg ICAgICBpZiAoaSA9PSBsYXN0MCkKLSAgICAgICAgICAgIHNldF9jb2xvcl9jb250ZXh0IChSRVNF VF9DT05URVhUKTsKKyAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7 CiAgICAgICAgICAgaWYgKGZpbGVzWzBdLmxpbmJ1ZltpICsgMV1bLTFdID09ICdcbicpCiAgICAg ICAgICAgICBwdXRjICgnXG4nLCBvdXRmaWxlKTsKICAgICAgICAgfQpAQCAtNzcsMTMgKzc1LDEx IEBAIHByaW50X25vcm1hbF9odW5rIChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAvKiBQcmludCB0 aGUgbGluZXMgdGhhdCB0aGUgc2Vjb25kIGZpbGUgaGFzLiAgKi8KICAgaWYgKGNoYW5nZXMgJiBO RVcpCiAgICAgewotICAgICAgaWYgKGZpcnN0MSA8PSBsYXN0MSkKLSAgICAgICAgc2V0X2NvbG9y X2NvbnRleHQgKEFERF9DT05URVhUKTsKICAgICAgIGZvciAoaSA9IGZpcnN0MTsgaSA8PSBsYXN0 MTsgaSsrKQogICAgICAgICB7CisgICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKEFERF9DT05U RVhUKTsKICAgICAgICAgICBwcmludF8xX2xpbmVfbmwgKCI+IiwgJmZpbGVzWzFdLmxpbmJ1Zltp XSwgdHJ1ZSk7Ci0gICAgICAgICAgaWYgKGkgPT0gbGFzdDEpCi0gICAgICAgICAgICBzZXRfY29s b3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CisgICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQg KFJFU0VUX0NPTlRFWFQpOwogICAgICAgICAgIGlmIChmaWxlc1sxXS5saW5idWZbaSArIDFdWy0x XSA9PSAnXG4nKQogICAgICAgICAgICAgcHV0YyAoJ1xuJywgb3V0ZmlsZSk7CiAgICAgICAgIH0K ZGlmZiAtLWdpdCBhL3Rlc3RzL2NvbG9ycyBiL3Rlc3RzL2NvbG9ycwppbmRleCBlNWI1ZjM2Li5k MjhhNjFjIDEwMDc1NQotLS0gYS90ZXN0cy9jb2xvcnMKKysrIGIvdGVzdHMvY29sb3JzCkBAIC0y OSw5ICsyOSw5IEBAIGdlbl9leHBfdSgpCiAgICAgbG9jYWwgZGU9JChwcmludGYgIiRlWyR7ZGV9 bSIpCiAgICAgbG9jYWwgbG49JChwcmludGYgIiRlWyR7bG59bSIpCiAgICAgcHJpbnRmICclcycg XAotIiRoZC0tLSBhJHRhYiRlcG9jaF9wbHVzCi0rKysgYiR0YWIkZXBvY2hfcGx1cwotJHJzJHts bn1AQCAtMSArMSBAQCRycworIiRoZC0tLSBhJHRhYiRlcG9jaF9wbHVzJHJzCiskaGQrKysgYiR0 YWIkZXBvY2hfcGx1cyRycworJHtsbn1AQCAtMSArMSBAQCRycwogJGRlLWEkcnMKICRhZCtiJHJz CiAiCkBAIC00Niw5ICs0Niw5IEBAIGdlbl9leHBfYygpCiAgICAgbG9jYWwgZGU9JChwcmludGYg IiRlWyR7ZGV9bSIpCiAgICAgbG9jYWwgbG49JChwcmludGYgIiRlWyR7bG59bSIpCiAgICAgcHJp bnRmICclcycgXAotIiRoZCoqKiBhJHRhYiRlcG9jaF9wb3NpeF8xMDAzXzFfMjAwMQotLS0tIGIk dGFiJGVwb2NoX3Bvc2l4XzEwMDNfMV8yMDAxCi0kcnMqKioqKioqKioqKioqKioKKyIkaGQqKiog YSR0YWIkZXBvY2hfcG9zaXhfMTAwM18xXzIwMDEkcnMKKyRoZC0tLSBiJHRhYiRlcG9jaF9wb3Np eF8xMDAzXzFfMjAwMSRycworKioqKioqKioqKioqKioqCiAkbG4qKiogMSAqKioqJHJzCiAkZGUh IGEkcnMKICRsbi0tLSAxIC0tLS0kcnMKLS0gCjIuMjAuMS4yLmdiMjFlYmI2NzFiCgo= --000000000000e413b8057e2fa797-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 29 16:49:48 2018 Received: (at 31105) by debbugs.gnu.org; 29 Dec 2018 21:49:48 +0000 Received: from localhost ([127.0.0.1]:41680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdMUN-0005tu-Og for submit@debbugs.gnu.org; Sat, 29 Dec 2018 16:49:47 -0500 Received: from uofr.net ([50.116.51.30]:53434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdMUL-0005tf-Bh for 31105@debbugs.gnu.org; Sat, 29 Dec 2018 16:49:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=uofr.net; s=selector-1; h=MIME-Version:Content-Type:In-Reply-To:References:Subject:Cc:To:From:Message-ID:Date; bh=rAebhbQVlw68+a25dlxer1iMfnR8DJ5TERINf7vIo/I=; b=US6sH7/2McB1vMb73XkTfXvG8R5ikVxI/fAzuDC8XfgWgOZR8i3y9JACe0MM9fYC2RyQPk/TC+l0DSixk626PdILs+8+kVcXZgbOP14OykM5m+qr+OSLUYDiKi0wrLcQH34koj97E08SSkIYNeIHJyXknM8tpEHoK+cJtl3qtzU=; Received: from malsyned by uofr.net with esmtpsa id 1gdMTj-00036d-93; Sat, 29 Dec 2018 16:49:07 -0500 Received: from pool-96-230-124-99.bstnma.fios.verizon.net (pool-96-230-124-99.bstnma.fios.verizon.net [96.230.124.99]) by ssl.uofr.net (Horde Framework) with HTTPS; Sat, 29 Dec 2018 16:48:59 -0500 Date: Sat, 29 Dec 2018 16:48:59 -0500 Message-ID: <20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net> From: "Dennis Lambe Jr." To: Jim Meyering Subject: Re: [bug-diffutils] bug#31105: bug#31105: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> <20180409115317.54022sqdbsktmzxp@ssl.uofr.net> In-Reply-To: User-Agent: Horde Application Framework 5 Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes MIME-Version: 1.0 Content-Disposition: inline X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31105 Cc: 31105@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Quoting Jim Meyering : > However, the change is large enough that we'll also need a copyright > assignment from you. Can you do that? > Here are instructions: > https://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/Copyright/request-assign.changes I sent an email with the necessary information to assign@gnu.org Thanks for integrating this patch --Dennis From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 29 17:22:26 2018 Received: (at 31105) by debbugs.gnu.org; 29 Dec 2018 22:22:26 +0000 Received: from localhost ([127.0.0.1]:41685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdMzw-0006go-DY for submit@debbugs.gnu.org; Sat, 29 Dec 2018 17:22:25 -0500 Received: from mail-wr1-f46.google.com ([209.85.221.46]:43434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdMzv-0006gd-5y for 31105@debbugs.gnu.org; Sat, 29 Dec 2018 17:22:23 -0500 Received: by mail-wr1-f46.google.com with SMTP id r10so23809754wrs.10 for <31105@debbugs.gnu.org>; Sat, 29 Dec 2018 14:22:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=f6zR8kbAPy8OCNYy02BH1F6BAdTWYnfb+BDGDrg7LxQ=; b=J8XF4AQrXQ3uc27ZbYgpX86o3pG6XQSDqFg/58DmlwGcJ89++Ek8vuBQI0MwZgDxeV swGbDKzRjojThrngAMpHRSvuwTDh4oT26nkADmC+mJ21iHNwuONpwxj346ThhyCErdxp qwDlsvRv5AMsWwR9d/Xvj9cRyytrPj3W723hhYg74WWCtNl1aa6eC96Fi5F/C2J6bJUk IDUKJAzJe13KfLaZOLks+kOs7ZeVQwhGZB2CnOJEHMutSz2tXfhx3WtwGfjAZd0Y5ItY E4gqKN1ZiFhXJX5bM1y3OWudqJNVrsSDUWK6FjatzOPFmq6+xI3YBgLakObvNo3pygLn somA== X-Gm-Message-State: AJcUukcNIPTbQnRB81W1+mzIItqXy4lPxyU8ZwATxuRbAXus6dbBf3ju WyEn+brD845oHL+vK+yzegLnT9vKC2irEE9fA8U= X-Google-Smtp-Source: ALg8bN5YzZnzPJ43rfBQsyU52OQanPhEyuhxNyfgZH/tBXUm6OTxrQNl21eFDtsgE9eJH5NVHspcWJvmvCDy4ym7ENI= X-Received: by 2002:adf:83e7:: with SMTP id 94mr29522353wre.278.1546122137477; Sat, 29 Dec 2018 14:22:17 -0800 (PST) MIME-Version: 1.0 References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> <20180409115317.54022sqdbsktmzxp@ssl.uofr.net> <20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net> In-Reply-To: <20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net> From: Jim Meyering Date: Sat, 29 Dec 2018 14:22:04 -0800 Message-ID: Subject: Re: [bug-diffutils] bug#31105: bug#31105: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R To: "Dennis Lambe Jr." Content-Type: multipart/alternative; boundary="000000000000c8a87e057e309cbf" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31105 Cc: 31105@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000c8a87e057e309cbf Content-Type: text/plain; charset="UTF-8" On Sat, Dec 29, 2018, 13:49 Dennis Lambe Jr. > Quoting Jim Meyering : > > > However, the change is large enough that we'll also need a copyright > > assignment from you. Can you do that? > > Here are instructions: > > > https://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/Copyright/request-assign.changes > > I sent an email with the necessary information to assign@gnu.org > > Thanks for integrating this patch > Thanks for contributing. Want to write the NEWS blurb for it? > --000000000000c8a87e057e309cbf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Sat, = Dec 29, 2018, 13:49 Dennis Lambe Jr. <malsyned@malsyned.net wrote:

Quoting Jim Meyering <jim@meyering.net>:

> However, the change is large enough that we'll also need a copyrig= ht
> assignment from you. Can you do that?
> Here are instructions:
> https://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/Copyright/request-a= ssign.changes

I sent an email with the necessary information to assign@gnu.org

Thanks for integrating this patch

Thanks for contributing. Want to write the= NEWS blurb for it?
--000000000000c8a87e057e309cbf-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 29 17:45:46 2018 Received: (at 31105) by debbugs.gnu.org; 29 Dec 2018 22:45:46 +0000 Received: from localhost ([127.0.0.1]:41692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdNMY-0007IR-0K for submit@debbugs.gnu.org; Sat, 29 Dec 2018 17:45:46 -0500 Received: from uofr.net ([50.116.51.30]:54064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdNMW-0007ID-Ge for 31105@debbugs.gnu.org; Sat, 29 Dec 2018 17:45:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=uofr.net; s=selector-1; h=MIME-Version:Content-Type:In-Reply-To:References:Subject:Cc:To:From:Message-ID:Date; bh=AFixfy/gYIMJGDygpfLMs9ruH/3KLSkcI/elnotiGAI=; b=Yu7s7qMQjC4AD4BGh1GbD0isvUpUlIT20flcXnbuNXtjSoJc6knmVEVp5LMiHtSIFUWC0ogsgshnH+4ll1IQZOogQKmxcZHKW7a5hrSjuOt8NFsUiWUt92c16pbhU5zuOpXoOhMXtiPqPKBWc/ZTpSASfs8SuI7eriFeg2O8vrE=; Received: from malsyned by uofr.net with esmtpsa id 1gdNMQ-0003Rh-Lh; Sat, 29 Dec 2018 17:45:38 -0500 Received: from pool-96-230-124-99.bstnma.fios.verizon.net (pool-96-230-124-99.bstnma.fios.verizon.net [96.230.124.99]) by ssl.uofr.net (Horde Framework) with HTTPS; Sat, 29 Dec 2018 17:45:38 -0500 Date: Sat, 29 Dec 2018 17:45:38 -0500 Message-ID: <20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net> From: "Dennis Lambe Jr." To: Jim Meyering Subject: Re: [bug-diffutils] bug#31105: bug#31105: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> <20180409115317.54022sqdbsktmzxp@ssl.uofr.net> <20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net> In-Reply-To: User-Agent: Horde Application Framework 5 Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes MIME-Version: 1.0 Content-Disposition: inline X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31105 Cc: 31105@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Quoting Jim Meyering : > Thanks for contributing. Want to write the NEWS blurb for it? Sure. I don't know if this qualifies as a bug fix, or new feature, or what. But how about this? diff --color now produces output compatible with less -R. From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 30 19:15:49 2018 Received: (at 31105) by debbugs.gnu.org; 31 Dec 2018 00:15:49 +0000 Received: from localhost ([127.0.0.1]:42715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdlFF-0004FL-0T for submit@debbugs.gnu.org; Sun, 30 Dec 2018 19:15:49 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41991) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdlFC-0004F5-Nf for 31105@debbugs.gnu.org; Sun, 30 Dec 2018 19:15:47 -0500 Received: by mail-wr1-f66.google.com with SMTP id q18so25418600wrx.9 for <31105@debbugs.gnu.org>; Sun, 30 Dec 2018 16:15:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ux2Hf/sc8Mow4V9qAvCVCnxhGkvNIuPYc22aV7m+ZBc=; b=OH1zlZzk8Qq1b3h6EJAb8NpKm2jbBdALJ/ztg/QHcLkEpmn+/lANt08gHW5LPNA8Cj VvHkQtvEEMo2UDZJ+mw5kLl5aele7g0gjyUX0vfyuSIxakAoC1+Jro/MyWvHBURpJadu oFGF4WCwNsLrGI7OoeNHCFk095lBMALmOd0k89m/EPx4GllbmzCRPpCNNjjmVHwJ0VRR BOJSfABK2n8HajQl8FYFXVgK9D1YI4EIfABW8lAYT715ZBl3/UXM6s79U6CU4rDVc9nV RNtk1XuCi2hhSwEladXvfdIZa3zMpDDT4lNq/7bwGVhHkpaYqzTNW00zdoce/rkNFV1O +v+w== X-Gm-Message-State: AJcUukeY3zBMMP2FKfp9EfVjdk24hW/zWVzFETMXwq1pKGNOMU/cLO+k y0dsmWiLWn8D+dnCZ8gQWTlErI7UBRUIMDjACmeAegaT X-Google-Smtp-Source: ALg8bN7LL+6drPdiu/zMKZ5XcaryvL0Dmf4H66zRW7uI0kSryKXx1prPZK0bFsg1YqY8v/Zi/lHVYSTr/WvRwTMDxcE= X-Received: by 2002:adf:c108:: with SMTP id r8mr32915121wre.233.1546215340969; Sun, 30 Dec 2018 16:15:40 -0800 (PST) MIME-Version: 1.0 References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> <20180409115317.54022sqdbsktmzxp@ssl.uofr.net> <20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net> <20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net> In-Reply-To: <20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net> From: Jim Meyering Date: Sun, 30 Dec 2018 16:15:28 -0800 Message-ID: Subject: Re: [bug-diffutils] bug#31105: bug#31105: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R To: "Dennis Lambe Jr." Content-Type: multipart/mixed; boundary="000000000000252fcc057e46507f" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31105 Cc: 31105@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000252fcc057e46507f Content-Type: text/plain; charset="UTF-8" On Sat, Dec 29, 2018 at 2:45 PM Dennis Lambe Jr. wrote: ... > Sure. I don't know if this qualifies as a bug fix, or new feature, or > what. But how about this? > > diff --color now produces output compatible with less -R. Thanks. I put that in a NEWS section labeled "Improvements." I've made some trivial SP/TAB indentation changes in an attempt to reach consistency (the existing code is not consistent on that front), removed the braces you added around a single-statement "then" block, and made this change: - fprintf (outfile, "\n"); + putc ('\n', outfile); Re TAB-vs-SP indentation, after the upcoming release, I will make the global substitution to convert all indentation TABs to spaces. Here's the result. Please review carefully and let me know if you would like to change anything. I won't push until after I've heard from you. --000000000000252fcc057e46507f Content-Type: application/octet-stream; name="diff-less-color.diff" Content-Disposition: attachment; filename="diff-less-color.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jqbkhvtr0 RnJvbSBhZDY1NTkxZDg0NDJmMGQ3OTQxZmE3ZGJkZmRiYTgzNGM4NzQzOWY2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEZW5uaXMgTGFtYmUgSnIgPG1hbHN5bmVkQG1hbHN5bmVkLm5l dD4KRGF0ZTogU2F0LCAyOSBEZWMgMjAxOCAxMzowNDoxMCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hd IGRpZmY6IGFkanVzdCBBTlNJIGVzY2FwZXMgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBsZXNzIC1S CgpHTlUgbGVzcyBjYW4gZGlzcGxheSBBTlNJLWNvbG9yZWQgdGV4dCB3aXRoIHRoZSAtUiBmbGFn LCBidXQgdGhpcwpzdXBwb3J0IGhhcyBzb21lIGxpbWl0YXRpb25zLiBPbmUgb2YgdGhlbSBpcyB0 aGF0IGlmIGFuIGVzY2FwZQpzZXF1ZW5jZSBzdGFydHMgb24gb25lIGxpbmUgYW5kIGVuZHMgb24g YSBkaWZmZXJlbnQgbGluZSwgb25seSB0aGUKZmlyc3QgbGluZSB3aWxsIGJlIGNvbG9yZWQgaW4g bGVzcy4KCkFzIGEgcmVzdWx0LCB3aGVuIGRpZmYgY3JlYXRlcyBjb2xvcmVkIG91dHB1dCB3aXRo IG11bHRpLWxpbmUgZGVsZXRlcwpvciBhZGRzLCBsZXNzIHdpbGwgb25seSBjb2xvciB0aGUgZmly c3QgbGluZS4KClRoaXMgY2hhbmdlIHJlc2V0cyBBTlNJIGNvbG9yIHRvIHRoZSBkZWZhdWx0IGF0 IHRoZSBlbmQgb2YKZWFjaCBsaW5lIGFuZCByZXN0YXJ0cyBpdCBhdCB0aGUgYmVnaW5uaW5nIG9m IHRoZSBuZXh0LiBJdCBwYXRjaGVzCm5vcm1hbCBhbmQgY29udGV4dCBtb2RlLiBTaWRlLWJ5LXNp ZGUgYWxyZWFkeSB3b3JrZWQgaW4gbXkgdGVzdGluZy4KKiBzcmMvY29udGV4dC5jIChwcmludF9j b250ZXh0X2xhYmVsLCBwcl9jb250ZXh0X2h1bmspOiBBcyBhYm92ZS4KKHByX3VuaWRpZmZfaHVu aywgcHJpbnRfY29udGV4dF9oZWFkZXIpOiBMaWtld2lzZS4KKiBzcmMvbm9ybWFsLmMgKHByaW50 X25vcm1hbF9odW5rKTogTGlrZXdpc2UuCiogdGVzdHMvY29sb3JzOiBBZGp1c3QgZXhpc3Rpbmcg dGVzdHMgdG8gYWNjb21tb2RhdGUgdGhpcy4KKiBORVdTIChJbXByb3ZlbWVudHMpOiBNZW50aW9u IGl0LgpQcm9wb3NlZCBpbiBodHRwOi8vYnVncy5nbnUub3JnLzMxMTA1Ci0tLQogTkVXUyAgICAg ICAgICB8ICA0ICsrKysKIHNyYy9jb250ZXh0LmMgfCAzNyArKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiBzcmMvbm9ybWFsLmMgIHwgMTIgKysrKy0tLS0tLS0tCiB0ZXN0cy9j b2xvcnMgIHwgMTIgKysrKysrLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMo KyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL05FV1MgYi9ORVdTCmluZGV4IDdkMTE1 YTMuLmRiNDdjNGEgMTAwNjQ0Ci0tLSBhL05FV1MKKysrIGIvTkVXUwpAQCAtOSw2ICs5LDEwIEBA IEdOVSBkaWZmdXRpbHMgTkVXUyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0q LSBvdXRsaW5lIC0qLQogICAgIGRpZmYgLWEgLS1zdHJpcC10cmFpbGluZy1jciA8KHByaW50ZiAn XHInKSA8KGVjaG8gYSkKICAgW2J1ZyBpbnRyb2R1Y2VkIGluIDIuOCB3aXRoIGFkZGl0aW9uIG9m IHRoZSAtLXN0cmlwLXRyYWlsaW5nLWNyIG9wdGlvbl0KCisqKiBJbXByb3ZlbWVudHMKKworICBk aWZmIC0tY29sb3Igbm93IHByb2R1Y2VzIG91dHB1dCBjb21wYXRpYmxlIHdpdGggbGVzcyAtUi4K KwoKICogTm90ZXdvcnRoeSBjaGFuZ2VzIGluIHJlbGVhc2UgMy42ICgyMDE3LTA1LTIxKSBbc3Rh YmxlXQoKZGlmZiAtLWdpdCBhL3NyYy9jb250ZXh0LmMgYi9zcmMvY29udGV4dC5jCmluZGV4IDRk ZDg4MmQuLmQxOTMwZDkgMTAwNjQ0Ci0tLSBhL3NyYy9jb250ZXh0LmMKKysrIGIvc3JjL2NvbnRl eHQuYwpAQCAtNDMsOCArNDMsOSBAQCBwcmludF9jb250ZXh0X2xhYmVsIChjaGFyIGNvbnN0ICpt YXJrLAogCQkgICAgIGNoYXIgY29uc3QgKm5hbWUsCiAJCSAgICAgY2hhciBjb25zdCAqbGFiZWwp CiB7CisgIHNldF9jb2xvcl9jb250ZXh0IChIRUFERVJfQ09OVEVYVCk7CiAgIGlmIChsYWJlbCkK LSAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXNcbiIsIG1hcmssIGxhYmVsKTsKKyAgICBmcHJp bnRmIChvdXRmaWxlLCAiJXMgJXMiLCBtYXJrLCBsYWJlbCk7CiAgIGVsc2UKICAgICB7CiAgICAg ICBjaGFyIGJ1ZltNQVggKElOVF9TVFJMRU5fQk9VTkQgKGludCkgKyAzMiwKQEAgLTcxLDggKzcy LDEwIEBAIHByaW50X2NvbnRleHRfbGFiZWwgKGNoYXIgY29uc3QgKm1hcmssCiAJICAgICAgc3By aW50ZiAoYnVmLCAiJSJQUkl1TUFYIi4lLjlkIiwgc2VjLCBuc2VjKTsKIAkgICAgfQogCX0KLSAg ICAgIGZwcmludGYgKG91dGZpbGUsICIlcyAlc1x0JXNcbiIsIG1hcmssIG5hbWUsIGJ1Zik7Cisg ICAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXNcdCVzIiwgbWFyaywgbmFtZSwgYnVmKTsKICAg ICB9CisgIHNldF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKKyAgcHV0YyAoJ1xuJywg b3V0ZmlsZSk7CiB9CgogLyogUHJpbnQgYSBoZWFkZXIgZm9yIGEgY29udGV4dCBkaWZmLCB3aXRo IHRoZSBmaWxlIG5hbWVzIGFuZCBkYXRlcy4gICovCkBAIC04MCw3ICs4Myw2IEBAIHByaW50X2Nv bnRleHRfbGFiZWwgKGNoYXIgY29uc3QgKm1hcmssCiB2b2lkCiBwcmludF9jb250ZXh0X2hlYWRl ciAoc3RydWN0IGZpbGVfZGF0YSBpbmZbXSwgY2hhciBjb25zdCAqY29uc3QgKm5hbWVzLCBib29s IHVuaWRpZmYpCiB7Ci0gIHNldF9jb2xvcl9jb250ZXh0IChIRUFERVJfQ09OVEVYVCk7CiAgIGlm ICh1bmlkaWZmKQogICAgIHsKICAgICAgIHByaW50X2NvbnRleHRfbGFiZWwgKCItLS0iLCAmaW5m WzBdLCBuYW1lc1swXSwgZmlsZV9sYWJlbFswXSk7CkBAIC05MSw3ICs5Myw2IEBAIHByaW50X2Nv bnRleHRfaGVhZGVyIChzdHJ1Y3QgZmlsZV9kYXRhIGluZltdLCBjaGFyIGNvbnN0ICpjb25zdCAq bmFtZXMsIGJvb2wgdW5pCiAgICAgICBwcmludF9jb250ZXh0X2xhYmVsICgiKioqIiwgJmluZlsw XSwgbmFtZXNbMF0sIGZpbGVfbGFiZWxbMF0pOwogICAgICAgcHJpbnRfY29udGV4dF9sYWJlbCAo Ii0tLSIsICZpbmZbMV0sIG5hbWVzWzFdLCBmaWxlX2xhYmVsWzFdKTsKICAgICB9Ci0gIHNldF9j b2xvcl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKIH0KCiAvKiBQcmludCBhbiBlZGl0IHNjcmlw dCBpbiBjb250ZXh0IGZvcm1hdC4gICovCkBAIC0yMTksMTEgKzIyMCwxMCBAQCBwcl9jb250ZXh0 X2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAgICAgewogICAgICAgc3RydWN0IGNoYW5nZSAq bmV4dCA9IGh1bms7CgotICAgICAgaWYgKGZpcnN0MCA8PSBsYXN0MCkKLSAgICAgICAgc2V0X2Nv bG9yX2NvbnRleHQgKERFTEVURV9DT05URVhUKTsKLQogICAgICAgZm9yIChpID0gZmlyc3QwOyBp IDw9IGxhc3QwOyBpKyspCiAJeworCSAgc2V0X2NvbG9yX2NvbnRleHQgKERFTEVURV9DT05URVhU KTsKKwogCSAgLyogU2tpcCBwYXN0IGNoYW5nZXMgdGhhdCBhcHBseSAoaW4gZmlsZSAwKQogCSAg ICAgb25seSB0byBsaW5lcyBiZWZvcmUgbGluZSBJLiAgKi8KCkBAIC0yNDEsOCArMjQxLDcgQEAg cHJfY29udGV4dF9odW5rIChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAgICAgICAgICAgICBwcmVm aXggPSAobmV4dC0+aW5zZXJ0ZWQgPiAwID8gIiEiIDogIi0iKTsKICAgICAgICAgICAgIH0KIAkg IHByaW50XzFfbGluZV9ubCAocHJlZml4LCAmZmlsZXNbMF0ubGluYnVmW2ldLCB0cnVlKTsKLSAg ICAgICAgICBpZiAoaSA9PSBsYXN0MCkKLSAgICAgICAgICAgIHNldF9jb2xvcl9jb250ZXh0IChS RVNFVF9DT05URVhUKTsKKyAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVY VCk7CiAgICAgICAgICAgaWYgKGZpbGVzWzBdLmxpbmJ1ZltpICsgMV1bLTFdID09ICdcbicpCiAg ICAgICAgICAgICBwdXRjICgnXG4nLCBvdXQpOwogCX0KQEAgLTI1OSwxMSArMjU4LDEwIEBAIHBy X2NvbnRleHRfaHVuayAoc3RydWN0IGNoYW5nZSAqaHVuaykKICAgICB7CiAgICAgICBzdHJ1Y3Qg Y2hhbmdlICpuZXh0ID0gaHVuazsKCi0gICAgICBpZiAoZmlyc3QxIDw9IGxhc3QxKQotICAgICAg ICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NPTlRFWFQpOwotCiAgICAgICBmb3IgKGkgPSBmaXJz dDE7IGkgPD0gbGFzdDE7IGkrKykKIAl7CisJICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NPTlRF WFQpOworCiAJICAvKiBTa2lwIHBhc3QgY2hhbmdlcyB0aGF0IGFwcGx5IChpbiBmaWxlIDEpCiAJ ICAgICBvbmx5IHRvIGxpbmVzIGJlZm9yZSBsaW5lIEkuICAqLwoKQEAgLTI4MSw4ICsyNzksNyBA QCBwcl9jb250ZXh0X2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAgICAgICAgICAgICAgIHBy ZWZpeCA9IChuZXh0LT5kZWxldGVkID4gMCA/ICIhIiA6ICIrIik7CiAgICAgICAgICAgICB9CiAJ ICBwcmludF8xX2xpbmVfbmwgKHByZWZpeCwgJmZpbGVzWzFdLmxpbmJ1ZltpXSwgdHJ1ZSk7Ci0g ICAgICAgICAgaWYgKGkgPT0gbGFzdDEpCi0gICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAo UkVTRVRfQ09OVEVYVCk7CisgICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRF WFQpOwogICAgICAgICAgIGlmIChmaWxlc1sxXS5saW5idWZbaSArIDFdWy0xXSA9PSAnXG4nKQog ICAgICAgICAgICAgcHV0YyAoJ1xuJywgb3V0KTsKIAl9CkBAIC0zOTAsMTkgKzM4NywxNyBAQCBw cl91bmlkaWZmX2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAJICAvKiBGb3IgZWFjaCBkaWZm ZXJlbmNlLCBmaXJzdCBvdXRwdXQgdGhlIGRlbGV0ZWQgcGFydC4gKi8KCiAJICBrID0gbmV4dC0+ ZGVsZXRlZDsKLSAgICAgICAgICBpZiAoaykKLSAgICAgICAgICAgIHNldF9jb2xvcl9jb250ZXh0 IChERUxFVEVfQ09OVEVYVCk7CgogCSAgd2hpbGUgKGstLSkKIAkgICAgewogCSAgICAgIGNoYXIg Y29uc3QgKiBjb25zdCAqbGluZSA9ICZmaWxlc1swXS5saW5idWZbaSsrXTsKKwkgICAgICBzZXRf Y29sb3JfY29udGV4dCAoREVMRVRFX0NPTlRFWFQpOwogCSAgICAgIHB1dGMgKCctJywgb3V0KTsK IAkgICAgICBpZiAoaW5pdGlhbF90YWIgJiYgISAoc3VwcHJlc3NfYmxhbmtfZW1wdHkgJiYgKips aW5lID09ICdcbicpKQogCQlwdXRjICgnXHQnLCBvdXQpOwogCSAgICAgIHByaW50XzFfbGluZV9u bCAoTlVMTCwgbGluZSwgdHJ1ZSk7CgotICAgICAgICAgICAgICBpZiAoIWspCi0gICAgICAgICAg ICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRFWFQpOworCSAgICAgIHNldF9jb2xv cl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKCiAgICAgICAgICAgICAgIGlmIChsaW5lWzFdWy0x XSA9PSAnXG4nKQogICAgICAgICAgICAgICAgIHB1dGMgKCdcbicsIG91dCk7CkBAIC00MTEsMTkg KzQwNiwxNyBAQCBwcl91bmlkaWZmX2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAJICAvKiBU aGVuIG91dHB1dCB0aGUgaW5zZXJ0ZWQgcGFydC4gKi8KCiAJICBrID0gbmV4dC0+aW5zZXJ0ZWQ7 Ci0gICAgICAgICAgaWYgKGspCi0gICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NP TlRFWFQpOwoKICAgICAgICAgICB3aGlsZSAoay0tKQogCSAgICB7CiAJICAgICAgY2hhciBjb25z dCAqIGNvbnN0ICpsaW5lID0gJmZpbGVzWzFdLmxpbmJ1ZltqKytdOworCSAgICAgIHNldF9jb2xv cl9jb250ZXh0IChBRERfQ09OVEVYVCk7CiAJICAgICAgcHV0YyAoJysnLCBvdXQpOwogCSAgICAg IGlmIChpbml0aWFsX3RhYiAmJiAhIChzdXBwcmVzc19ibGFua19lbXB0eSAmJiAqKmxpbmUgPT0g J1xuJykpCiAJCXB1dGMgKCdcdCcsIG91dCk7CiAJICAgICAgcHJpbnRfMV9saW5lX25sIChOVUxM LCBsaW5lLCB0cnVlKTsKCi0gICAgICAgICAgICAgIGlmICghaykKLSAgICAgICAgICAgICAgICBz ZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CisgICAgICAgICAgICAgIHNldF9jb2xv cl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKCiAgICAgICAgICAgICAgIGlmIChsaW5lWzFdWy0x XSA9PSAnXG4nKQogICAgICAgICAgICAgICAgIHB1dGMgKCdcbicsIG91dCk7CmRpZmYgLS1naXQg YS9zcmMvbm9ybWFsLmMgYi9zcmMvbm9ybWFsLmMKaW5kZXggYzZhYWMwNy4uYmRiNzE4YiAxMDA2 NDQKLS0tIGEvc3JjL25vcm1hbC5jCisrKyBiL3NyYy9ub3JtYWwuYwpAQCAtNTksMTMgKzU5LDEx IEBAIHByaW50X25vcm1hbF9odW5rIChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAvKiBQcmludCB0 aGUgbGluZXMgdGhhdCB0aGUgZmlyc3QgZmlsZSBoYXMuICAqLwogICBpZiAoY2hhbmdlcyAmIE9M RCkKICAgICB7Ci0gICAgICBpZiAoZmlyc3QwIDw9IGxhc3QwKQotICAgICAgICBzZXRfY29sb3Jf Y29udGV4dCAoREVMRVRFX0NPTlRFWFQpOwogICAgICAgZm9yIChpID0gZmlyc3QwOyBpIDw9IGxh c3QwOyBpKyspCiAgICAgICAgIHsKKyAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoREVMRVRF X0NPTlRFWFQpOwogICAgICAgICAgIHByaW50XzFfbGluZV9ubCAoIjwiLCAmZmlsZXNbMF0ubGlu YnVmW2ldLCB0cnVlKTsKLSAgICAgICAgICBpZiAoaSA9PSBsYXN0MCkKLSAgICAgICAgICAgIHNl dF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKKyAgICAgICAgICBzZXRfY29sb3JfY29u dGV4dCAoUkVTRVRfQ09OVEVYVCk7CiAgICAgICAgICAgaWYgKGZpbGVzWzBdLmxpbmJ1ZltpICsg MV1bLTFdID09ICdcbicpCiAgICAgICAgICAgICBwdXRjICgnXG4nLCBvdXRmaWxlKTsKICAgICAg ICAgfQpAQCAtNzcsMTMgKzc1LDExIEBAIHByaW50X25vcm1hbF9odW5rIChzdHJ1Y3QgY2hhbmdl ICpodW5rKQogICAvKiBQcmludCB0aGUgbGluZXMgdGhhdCB0aGUgc2Vjb25kIGZpbGUgaGFzLiAg Ki8KICAgaWYgKGNoYW5nZXMgJiBORVcpCiAgICAgewotICAgICAgaWYgKGZpcnN0MSA8PSBsYXN0 MSkKLSAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKEFERF9DT05URVhUKTsKICAgICAgIGZvciAo aSA9IGZpcnN0MTsgaSA8PSBsYXN0MTsgaSsrKQogICAgICAgICB7CisgICAgICAgICAgc2V0X2Nv bG9yX2NvbnRleHQgKEFERF9DT05URVhUKTsKICAgICAgICAgICBwcmludF8xX2xpbmVfbmwgKCI+ IiwgJmZpbGVzWzFdLmxpbmJ1ZltpXSwgdHJ1ZSk7Ci0gICAgICAgICAgaWYgKGkgPT0gbGFzdDEp Ci0gICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CisgICAgICAg ICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRFWFQpOwogICAgICAgICAgIGlmIChmaWxl c1sxXS5saW5idWZbaSArIDFdWy0xXSA9PSAnXG4nKQogICAgICAgICAgICAgcHV0YyAoJ1xuJywg b3V0ZmlsZSk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL3Rlc3RzL2NvbG9ycyBiL3Rlc3RzL2Nv bG9ycwppbmRleCBlNWI1ZjM2Li5kMjhhNjFjIDEwMDc1NQotLS0gYS90ZXN0cy9jb2xvcnMKKysr IGIvdGVzdHMvY29sb3JzCkBAIC0yOSw5ICsyOSw5IEBAIGdlbl9leHBfdSgpCiAgICAgbG9jYWwg ZGU9JChwcmludGYgIiRlWyR7ZGV9bSIpCiAgICAgbG9jYWwgbG49JChwcmludGYgIiRlWyR7bG59 bSIpCiAgICAgcHJpbnRmICclcycgXAotIiRoZC0tLSBhJHRhYiRlcG9jaF9wbHVzCi0rKysgYiR0 YWIkZXBvY2hfcGx1cwotJHJzJHtsbn1AQCAtMSArMSBAQCRycworIiRoZC0tLSBhJHRhYiRlcG9j aF9wbHVzJHJzCiskaGQrKysgYiR0YWIkZXBvY2hfcGx1cyRycworJHtsbn1AQCAtMSArMSBAQCRy cwogJGRlLWEkcnMKICRhZCtiJHJzCiAiCkBAIC00Niw5ICs0Niw5IEBAIGdlbl9leHBfYygpCiAg ICAgbG9jYWwgZGU9JChwcmludGYgIiRlWyR7ZGV9bSIpCiAgICAgbG9jYWwgbG49JChwcmludGYg IiRlWyR7bG59bSIpCiAgICAgcHJpbnRmICclcycgXAotIiRoZCoqKiBhJHRhYiRlcG9jaF9wb3Np eF8xMDAzXzFfMjAwMQotLS0tIGIkdGFiJGVwb2NoX3Bvc2l4XzEwMDNfMV8yMDAxCi0kcnMqKioq KioqKioqKioqKioKKyIkaGQqKiogYSR0YWIkZXBvY2hfcG9zaXhfMTAwM18xXzIwMDEkcnMKKyRo ZC0tLSBiJHRhYiRlcG9jaF9wb3NpeF8xMDAzXzFfMjAwMSRycworKioqKioqKioqKioqKioqCiAk bG4qKiogMSAqKioqJHJzCiAkZGUhIGEkcnMKICRsbi0tLSAxIC0tLS0kcnMKLS0gCjIuMjAuMS4y LmdiMjFlYmI2NzFiCgo= --000000000000252fcc057e46507f-- From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 30 23:18:32 2018 Received: (at 31105) by debbugs.gnu.org; 31 Dec 2018 04:18:32 +0000 Received: from localhost ([127.0.0.1]:42756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdp28-0001fG-0n for submit@debbugs.gnu.org; Sun, 30 Dec 2018 23:18:32 -0500 Received: from uofr.net ([50.116.51.30]:46366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdp25-0001f1-O8 for 31105@debbugs.gnu.org; Sun, 30 Dec 2018 23:18:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=uofr.net; s=selector-1; h=MIME-Version:Content-Type:In-Reply-To:References:Subject:Cc:To:From:Message-ID:Date; bh=AlnYxylFMavrvov5hC3+uMHGK2SFj3F/yL6itOlvQxY=; b=MRUkIJkKzRQIWB237AFsbxeZBLUm1MHtE0bm27kon7TfNt95VohalRlAKLnfwMKObyYohnhzlQtM/Jle9rlM5SrZEHhPiAqthi+kudmETXZ7vFdM9aGOmz4ruFVWBqPg1nlurX0Y0aQF6w1vQsWPgSz2GY9EnaLj2VRTmsG8U58=; Received: from malsyned by uofr.net with esmtpsa id 1gdp1z-0000tU-Qo; Sun, 30 Dec 2018 23:18:23 -0500 Received: from pool-96-230-124-99.bstnma.fios.verizon.net (pool-96-230-124-99.bstnma.fios.verizon.net [96.230.124.99]) by ssl.uofr.net (Horde Framework) with HTTPS; Sun, 30 Dec 2018 23:18:23 -0500 Date: Sun, 30 Dec 2018 23:18:23 -0500 Message-ID: <20181230231823.Horde.BLmvvPWE0fSki610W4kXJNE@ssl.uofr.net> From: "Dennis Lambe Jr." To: Jim Meyering Subject: Re: [bug-diffutils] bug#31105: bug#31105: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> <20180409115317.54022sqdbsktmzxp@ssl.uofr.net> <20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net> <20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net> In-Reply-To: User-Agent: Horde Application Framework 5 Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes MIME-Version: 1.0 Content-Disposition: inline X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31105 Cc: 31105@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Quoting Jim Meyering : > Here's the result. Please review carefully and let me know if you > would like to change anything. I won't push until after I've heard > from you. Looks great to me -- thanks! --Dennis From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 31 01:25:56 2018 Received: (at 31105-done) by debbugs.gnu.org; 31 Dec 2018 06:25:56 +0000 Received: from localhost ([127.0.0.1]:42792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdr1P-0006o0-Qy for submit@debbugs.gnu.org; Mon, 31 Dec 2018 01:25:55 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:42703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdr1O-0006no-4A for 31105-done@debbugs.gnu.org; Mon, 31 Dec 2018 01:25:54 -0500 Received: by mail-wr1-f65.google.com with SMTP id q18so25755292wrx.9 for <31105-done@debbugs.gnu.org>; Sun, 30 Dec 2018 22:25:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=IVRhQH4szjTccUuPokS6smUkF8zGnNNu/G46ftH7BjY=; b=pk+4iGkJnD4bcLL9JkCpWrd7KipAfOvhwMR9J/Y04l4Bop/elOEOUXWbHHGyK1gwgA VLmj8WNSN6zW3VDCxAzlgiSe1Lcn1agELLgSN0A4EC2co8eplvY4UuRHhvMAeEIVDKvV 5HngpI5mwBm7BmVZRR3Pd3hBT5WRtSiTjJcfV2w0nhI46qayR88T01Guy0j0r/lcyl1U TMOPXMzsHYRcdlZItljEiIo7z6WKvMyxz01xJGYSP6l6n8QttO53HKjqISjvQxn3mQak wayj66/gFa0b2OjLcMr5/vXyGTk3DdU7K7wk579HlDLY9gUg/V0Nq9dS9Lz9VOPrJ9rf U9tQ== X-Gm-Message-State: AJcUukeAq4sHSTaMulZRES9WL1S7ySZ5wYoFctqrL/M/03DG7A36c+nb clzVdDRITVACxyoY1DxD/rTDLgLxa6Nm/0M7nPheFw== X-Google-Smtp-Source: ALg8bN7sroLnZKl+ZwfWQcM07kuNqW4sFsu/1gwpyd7dqd5u6UPW1siFd9kxQ8YI58PaNWDuHmxiRNssgOrvktuxwhA= X-Received: by 2002:adf:83e7:: with SMTP id 94mr32562669wre.278.1546237548348; Sun, 30 Dec 2018 22:25:48 -0800 (PST) MIME-Version: 1.0 References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net> <20180409115317.54022sqdbsktmzxp@ssl.uofr.net> <20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net> <20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net> <20181230231823.Horde.BLmvvPWE0fSki610W4kXJNE@ssl.uofr.net> In-Reply-To: <20181230231823.Horde.BLmvvPWE0fSki610W4kXJNE@ssl.uofr.net> From: Jim Meyering Date: Sun, 30 Dec 2018 22:25:35 -0800 Message-ID: Subject: Re: [bug-diffutils] bug#31105: bug#31105: [PATCH] Restart and reset ANSI escapes on each line for compatibility with less -R To: "Dennis Lambe Jr." Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31105-done Cc: 31105-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Sun, Dec 30, 2018 at 8:18 PM Dennis Lambe Jr. wrote: > Quoting Jim Meyering : > > Here's the result. Please review carefully and let me know if you > > would like to change anything. I won't push until after I've heard > > from you. > > Looks great to me -- thanks! Thanks. With that, I've pushed it and am marking this as "done". From unknown Fri Aug 15 14:16:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 28 Jan 2019 12:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator