Re: [PATCH] complist: Turn off colors before clearing to end of line

[Marlon Richert <marlon.richert@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

On Wed, Aug 18, 2021 at 7:07 AM Bart Schaefer <schaefer@brasslantern.com> wrote:
>
> On Tue, Aug 17, 2021 at 1:58 AM Marlon Richert <marlon.richert@gmail.com> wrote:
> >
> > <Without the patch, when changing selection, highlight continues until
> > end of line.>
> > <With the patch, it stops at the end of the match, just like the default.>
>
> And the zcoff() is never needed in the compprintfmt() branch?

Hm, good point. How about this patch instead?

[-- Attachment #2: 0001-complist-Turn-off-colors-before-clearing-to-end-of-l.txt --]
[-- Type: text/plain, Size: 1174 bytes --]

From 555dbb68a30bef5e224a5e01b9c3210884fd4a61 Mon Sep 17 00:00:00 2001
From: Marlon Richert <marlonrichert@users.noreply.github.com>
Date: Tue, 17 Aug 2021 11:43:06 +0300
Subject: [PATCH] complist: Turn off colors before clearing to end of line

---
 Src/Zle/complist.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 353cb3562..4d015991f 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -1306,6 +1306,7 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
     if (dopr) {
         if (!(cc % zterm_columns))
             fputs(" \010", shout);
+        zcoff();
         if (mlbeg >= 0 && tccan(TCCLEAREOL))
             tcout(TCCLEAREOL);
     }
@@ -1785,14 +1786,14 @@ clprintm(Cmgroup g, Cmatch *mp, int mc, int ml, int lastc, int width)
 	    zcputs(g->name, COL_DU);
 	else
 	    subcols = putmatchcol(g->name, m->disp);
-	if (subcols)
+	if (subcols) {
 	    ret = clprintfmt(m->disp, ml);
-	else {
+	    zcoff();
+	} else {
 	    compprintfmt(m->disp, 0, 1, 0, ml, &stop);
 	    if (stop)
 		ret = 1;
 	}
-	zcoff();
     } else {
 	int mx, modec;
 
-- 
2.32.0