diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-12-08 18:52:04 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-12-08 18:52:04 +0000 |
| commit | 1cac90759a7c43ab08d4f1582379f6f4a08437d1 (patch) | |
| tree | 0172986bdee62ed8d32e02e57661e9f040f3be0c /Src/Zle | |
| parent | 8c46ae708bf79d02f04f9cfc73afd87b519939f7 (diff) | |
| download | zsh-1cac90759a7c43ab08d4f1582379f6f4a08437d1.tar.gz zsh-1cac90759a7c43ab08d4f1582379f6f4a08437d1.tar.xz zsh-1cac90759a7c43ab08d4f1582379f6f4a08437d1.zip | |
23036: three more fixes for completion using $'...'
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/compcore.c | 1 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index b49fdd5c5..a21b83569 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -1653,6 +1653,7 @@ set_comp_sep(void) instring = QT_DOLLARS; nsptr++; tsptr++; + swb++; break; } diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index d678487db..1393027f7 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1032,6 +1032,16 @@ static int has_real_token(const char *s) { while (*s) { + /* + * Special action required for $' strings, which + * need to be treated like nulls. + */ + if ((*s == Qstring && s[1] == '\'') || + (*s == String && s[1] == Snull)) + { + s += 2; + continue; + } if (itok(*s) && !inull(*s)) return 1; s++; |