diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2017-03-08 21:33:25 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2017-03-08 21:33:25 -0800 |
| commit | c93f29b52d4dc6725841671cafd4a9ea845a9598 (patch) | |
| tree | 395d92c48968c60cd7b07339e93dd1a66c992376 | |
| parent | 071017965f469c88b10467205f30ea3e609e56dc (diff) | |
| download | zsh-c93f29b52d4dc6725841671cafd4a9ea845a9598.tar.gz zsh-c93f29b52d4dc6725841671cafd4a9ea845a9598.tar.xz zsh-c93f29b52d4dc6725841671cafd4a9ea845a9598.zip | |
40799: fix $- expansion partly broken by 40760
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/params.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 65ef5cc90..ec784d0ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -2017-03-08 Barton E. Schaefer <schaefer@brasslantern.com> +2017-03-08 Barton E. Schaefer <schaefer@zsh.org> + + * 40799: Src/params.c: fix $- expansion partly broken by 40760 * 40763: Src/Zle/compmatch.c, Src/Zle/computil.c, Src/utils.c: count wide characters and Cmatcher pointers more sanely in diff --git a/Src/params.c b/Src/params.c index b89fb74eb..785b9ead7 100644 --- a/Src/params.c +++ b/Src/params.c @@ -1987,7 +1987,9 @@ fetchvalue(Value v, char **pptr, int bracks, int flags) *s++ = '$'; else if (c == Star) *s++ = '*'; - else if (c == '#' || c == '-' || c == '?' || c == '$' || + else if (IS_DASH(c)) + *s++ = '-'; + else if (c == '#' || c == '?' || c == '$' || c == '!' || c == '@' || c == '*') s++; else |