diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-05-05 23:32:59 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-05-05 23:58:59 +0200 |
| commit | db38e167634b6c2217eec3a5aafc37c46d9e5a8d (patch) | |
| tree | daa342d423febbd3a5a7ef97053037677fab004a /Src/Zle/zle_refresh.c | |
| parent | 01eea47617a6e06debdb4330f92ae69f92089fd2 (diff) | |
| parent | 3c3c8d3d13fd4cf6c03f81ca8dc18a1efd561728 (diff) | |
| download | zsh-db38e167634b6c2217eec3a5aafc37c46d9e5a8d.tar.gz zsh-db38e167634b6c2217eec3a5aafc37c46d9e5a8d.zip | |
Merge branch 'upstream' into debian
Diffstat (limited to 'Src/Zle/zle_refresh.c')
| -rw-r--r-- | Src/Zle/zle_refresh.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c index 684ac13a2..fe337993f 100644 --- a/Src/Zle/zle_refresh.c +++ b/Src/Zle/zle_refresh.c @@ -396,8 +396,10 @@ get_region_highlight(UNUSED(Param pm)) struct region_highlight *rhp; /* region_highlights may not have been set yet */ - if (arrsize) - arrsize -= N_SPECIAL_HIGHLIGHTS; + if (!arrsize) + return hmkarray(NULL); + arrsize -= N_SPECIAL_HIGHLIGHTS; + DPUTS(arrsize < 0, "arrsize is negative from n_region_highlights"); arrp = retarr = (char **)zhalloc((arrsize+1)*sizeof(char *)); /* ignore special highlighting */ @@ -449,10 +451,15 @@ set_region_highlight(UNUSED(Param pm), char **aval) len = aval ? arrlen(aval) : 0; if (n_region_highlights != len + N_SPECIAL_HIGHLIGHTS) { /* no null termination, but include special highlighting at start */ - n_region_highlights = len + N_SPECIAL_HIGHLIGHTS; + int newsize = len + N_SPECIAL_HIGHLIGHTS; + int diffsize = newsize - n_region_highlights; region_highlights = (struct region_highlight *) zrealloc(region_highlights, - sizeof(struct region_highlight) * n_region_highlights); + sizeof(struct region_highlight) * newsize); + if (diffsize > 0) + memset(region_highlights + newsize - diffsize, 0, + sizeof(struct region_highlight) * diffsize); + n_region_highlights = newsize; } if (!aval) @@ -1028,6 +1035,8 @@ zrefresh(void) /* this will create region_highlights if it's still NULL */ zle_set_highlight(); + DPUTS(!region_highlights, "region_highlights not created"); + /* check for region between point ($CURSOR) and mark ($MARK) */ if (region_active) { if (zlecs <= mark) { @@ -1037,6 +1046,15 @@ zrefresh(void) region_highlights[0].start = mark; region_highlights[0].end = zlecs; } + if (region_active == 2) { + int origcs = zlecs; + zlecs = region_highlights[0].end; + region_highlights[0].end = findeol(); + zlecs = region_highlights[0].start; + region_highlights[0].start = findbol(); + zlecs = origcs; + } else if (invicmdmode()) + INCPOS(region_highlights[0].end); } else { region_highlights[0].start = region_highlights[0].end = -1; } |