Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: PATCH: fix updates to region_highlight, accounting for PREDISPLAY
- X-seq: zsh-workers 51295
- From: Oliver Kiddle <opk@xxxxxxx>
- To: Zsh workers <zsh-workers@xxxxxxx>
- Subject: Re: PATCH: fix updates to region_highlight, accounting for PREDISPLAY
- Date: Wed, 11 Jan 2023 14:01:25 +0100
- Archived-at: <https://zsh.org/workers/51295>
- In-reply-to: <92837-1673369733.527434@Np6E.5Ah8.qv5l>
- List-id: <zsh-workers.zsh.org>
- References: <92837-1673369733.527434@Np6E.5Ah8.qv5l>
I wrote:
> Or perhaps just make a special case for the end of PREDISPLAY?
After thinking about it, this approach is probably logical. It is
already the case that a region will only be extended at the end if the
cursor is positioned there.
In testing this, I also found an old bug where attributes could be
messed up because they were saved to an int instead of a zattr.
Oliver
diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c
index 45a82dd5e..9ce91049c 100644
--- a/Src/Zle/zle_utils.c
+++ b/Src/Zle/zle_utils.c
@@ -580,7 +580,7 @@ struct zle_region;
struct zle_region {
struct zle_region *next;
/* Entries of region_highlight, as needed */
- int atr;
+ zattr atr;
int start;
int end;
int flags;
@@ -799,7 +799,7 @@ spaceinline(int ct)
if (rhp->start_meta - sub >= zlemetacs) {
rhp->start_meta += ct;
}
- if (rhp->end_meta - sub >= zlemetacs) {
+ if (rhp->end_meta - sub >= zlemetacs && (!predisplaylen || zlecs)) {
rhp->end_meta += ct;
}
}
@@ -827,7 +827,7 @@ spaceinline(int ct)
if (rhp->start - sub >= zlecs) {
rhp->start += ct;
}
- if (rhp->end - sub >= zlecs) {
+ if (rhp->end - sub >= zlecs && (!predisplaylen || zlecs)) {
rhp->end += ct;
}
}
Messages sorted by:
Reverse Date,
Date,
Thread,
Author