diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2018-04-07 15:12:57 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2018-04-07 15:12:57 +0200 |
| commit | 6e1ab9aa550695ee7e3d467b4173c0b83ba7f759 (patch) | |
| tree | 8fb7faa4364a7cbf1cba48296a5f537e13f2a8d9 /Src/prompt.c | |
| parent | 5ad56a41f1ee2e61abca079f5ea8909f895ac2dd (diff) | |
| parent | f027f1d6e876708bc75d4217e1ca26898658d8d3 (diff) | |
| download | zsh-6e1ab9aa550695ee7e3d467b4173c0b83ba7f759.tar.gz zsh-6e1ab9aa550695ee7e3d467b4173c0b83ba7f759.zip | |
Merge tag 'zsh-5.4.2-test-2' / 'upstream' branch into 'debian' branch
Test version 2 prior to zsh 5.5.
Diffstat (limited to 'Src/prompt.c')
| -rw-r--r-- | Src/prompt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Src/prompt.c b/Src/prompt.c index c478e69fb..95da52559 100644 --- a/Src/prompt.c +++ b/Src/prompt.c @@ -315,7 +315,7 @@ putpromptchar(int doprint, int endchar, unsigned int *txtchangep) case '/': case 'C': /* `/' gives 0, `/any' gives 1, etc. */ - if (*ss++ == '/' && *ss) + if (*ss && *ss++ == '/' && *ss) arg--; for (; *ss; ss++) if (*ss == '/') @@ -1087,7 +1087,7 @@ countprompt(char *str, int *wp, int *hp, int overf) #endif for (; *str; str++) { - if (w >= zterm_columns && overf >= 0) { + if (w > zterm_columns && overf >= 0) { w = 0; h++; } |