mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00
Code

23036: three more fixes for completion using $'...'

Browse Source
This commit is contained in:
Peter Stephenson 2006-12-08 18:52:04 +00:00
parent 8c46ae708b
commit 1cac90759a
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-12-08 Peter Stephenson <pws@csr.com>
* 23036: Src/utils.c, Src/Zle/compcore.c, Src/Zle/zle_tricky.c:
three more fixes for completion using $'...'.
2006-12-04 Peter Stephenson <pws@csr.com>
* 23028: configure.ac, Config/defs.mk.in, Doc/Makefile.in:

1
Src/Zle/compcore.c
View File

@ -1653,6 +1653,7 @@ set_comp_sep(void)
instring = QT_DOLLARS;
nsptr++;
tsptr++;
swb++;
break;
}

10
Src/Zle/zle_tricky.c
View File

@ -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++;

14
Src/utils.c
View File

@ -4292,9 +4292,17 @@ quotestring(const char *s, char **e, int instring)
if (!*u)
u--;
continue;
}
else if ((*u == String || *u == Qstring) &&
(u[1] == Inpar || u[1] == Inbrack || u[1] == Inbrace)) {
} else if ((*u == Qstring || *u == '$') && u[1] == '\'' &&
instring == QT_DOUBLE) {
/*
* We don't need to quote $'...' inside a double-quoted
* string. This is largely cosmetic; it looks neater
* if we don't but it doesn't do any harm since the
* \ is stripped.
*/
*v++ = *u++;
} else if ((*u == String || *u == Qstring) &&
(u[1] == Inpar || u[1] == Inbrack || u[1] == Inbrace)) {
char c = (u[1] == Inpar ? Outpar : (u[1] == Inbrace ?
Outbrace : Outbrack));
char beg = *u;