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/Zle/complist.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/Zle/complist.c')
| -rw-r--r-- | Src/Zle/complist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index a83daeff9..e768aee5d 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -1097,6 +1097,9 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop) if (*p) { int arg = 0, is_fg; + if (idigit(*p)) + arg = zstrtol(p, &p, 10); + len = MB_METACHARLENCONV(p, &cchar); #ifdef MULTIBYTE_SUPPORT if (cchar == WEOF) @@ -1104,9 +1107,6 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop) #endif p += len; - if (idigit(*p)) - arg = zstrtol(p, &p, 10); - m = 0; switch (cchar) { case ZWC('%'): |