diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-07-25 10:45:59 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-07-25 10:45:59 +0000 |
| commit | e1708022d206dfe183bbce3d03c7e5e02abc3a59 (patch) | |
| tree | 2c557f74ae28f39de59fba7c75b462b19a184fd2 /Src | |
| parent | eba59194d72250402bdbb97a866ffea89ec9d7a7 (diff) | |
| download | zsh-e1708022d206dfe183bbce3d03c7e5e02abc3a59.tar.gz zsh-e1708022d206dfe183bbce3d03c7e5e02abc3a59.tar.xz zsh-e1708022d206dfe183bbce3d03c7e5e02abc3a59.zip | |
fixlet for 15477, don't let it remove consecutive dummy matches (15482)
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Zle/compcore.c | 2 | ||||
| -rw-r--r-- | Src/Zle/computil.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 00dfea935..d3f720478 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -1637,7 +1637,7 @@ addmatches(Cadata dat, char **argv) return 1; } if (dat->dummies) - dat->aflags = dat->aflags | CAF_NOSORT | CAF_UNIQALL; + dat->aflags = (dat->aflags | CAF_NOSORT | CAF_UNIQCON) & ~CAF_UNIQALL; for (bp = brbeg; bp; bp = bp->next) bp->curpos = ((dat->aflags & CAF_QUOTE) ? bp->pos : bp->qpos); for (bp = brend; bp; bp = bp->next) diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index 7548a87bf..902bb123c 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -208,6 +208,8 @@ cd_prep() for (str = set->strs; str; str = str->next) { if (str->kind != 1) { if (!str->kind && str->desc) { + if (str->len > wids[0]) + wids[0] = str->len; str->other = NULL; *strp++ = str; } @@ -536,7 +538,7 @@ cd_get(char **params) if (dp[0][0] == '-' && dp[0][1] == 'J') break; if (*dp) { - char *s = tricat("-1V", "", dp[0] + 2); + char *s = tricat("-2V", "", dp[0] + 2); zsfree(*dp); *dp = s; @@ -545,7 +547,7 @@ cd_get(char **params) (arrlen(opts + 1) + 1) * sizeof(char *)); } else - opts[0] = ztrdup("-1V-default-"); + opts[0] = ztrdup("-2V-default-"); csl = "packed rows"; break; |