diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-08-07 09:26:09 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-08-07 09:26:09 -0700 |
| commit | 6fc3b67b80c5bef6b1241657f7d1e5f55f6af1bf (patch) | |
| tree | 6cbdb1cabecc04d7efc21187eae596fcc777c398 /Src | |
| parent | c810a072e220914444b38b87aaee5ae40edb6466 (diff) | |
| download | zsh-6fc3b67b80c5bef6b1241657f7d1e5f55f6af1bf.tar.gz zsh-6fc3b67b80c5bef6b1241657f7d1e5f55f6af1bf.tar.xz zsh-6fc3b67b80c5bef6b1241657f7d1e5f55f6af1bf.zip | |
32971: negative argument with %(l..) and with %<< or %>> calculates space available before right margin
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/prompt.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Src/prompt.c b/Src/prompt.c index c16d78163..328ae3c66 100644 --- a/Src/prompt.c +++ b/Src/prompt.c @@ -367,6 +367,8 @@ putpromptchar(int doprint, int endchar, unsigned int *txtchangep) case 'l': *bv->bp = '\0'; countprompt(bv->bufline, &t0, 0, 0); + if (minus) + t0 = zterm_columns - t0; if (t0 >= arg) test = 1; break; @@ -560,6 +562,14 @@ putpromptchar(int doprint, int endchar, unsigned int *txtchangep) break; case '<': case '>': + /* Test (minus) here so -0 means "at the right margin" */ + if (minus) { + *bv->bp = '\0'; + countprompt(bv->bufline, &t0, 0, 0); + arg = zterm_columns - t0 + arg; + if (arg <= 0) + arg = 1; + } if (!prompttrunc(arg, *bv->fm, doprint, endchar, txtchangep)) return *bv->fm; break; @@ -1174,7 +1184,7 @@ prompttrunc(int arg, int truncchar, int doprint, int endchar, addbufspc(1); *bv->bp++ = '<'; } - ptr = bv->buf + w; /* addbv->bufspc() may have realloc()'d bv->buf */ + ptr = bv->buf + w; /* addbufspc() may have realloc()'d bv->buf */ /* * Now: * bv->buf is the start of the output prompt buffer @@ -1189,7 +1199,7 @@ prompttrunc(int arg, int truncchar, int doprint, int endchar, bv->trunccount = bv->dontcount; putpromptchar(doprint, endchar, txtchangep); bv->trunccount = 0; - ptr = bv->buf + w; /* putpromptchar() may have realloc()'d */ + ptr = bv->buf + w; /* putpromptchar() may have realloc()'d */ *bv->bp = '\0'; /* * Now: @@ -1475,7 +1485,7 @@ prompttrunc(int arg, int truncchar, int doprint, int endchar, /* Now we have to trick it into matching endchar again */ bv->fm--; } else { - if (*bv->fm != ']') + if (*bv->fm != endchar) bv->fm++; while(*bv->fm && *bv->fm != truncchar) { if (*bv->fm == '\\' && bv->fm[1]) |