diff options
author | Barton E. Schaefer <schaefer@zsh.org> | 2016-10-25 12:45:51 -0700 |
---|---|---|
committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-10-25 12:45:51 -0700 |
commit | 364c4047e710b779167d697b956e224944cb0c84 (patch) | |
tree | 2436b1b470164dd320b8bc24fc609ac4b15083f7 | |
parent | 39ae9cd10a5987ac71dee8bef7bd3bc2ba5e4eb8 (diff) | |
download | zsh-364c4047e710b779167d697b956e224944cb0c84.tar.gz zsh-364c4047e710b779167d697b956e224944cb0c84.tar.xz zsh-364c4047e710b779167d697b956e224944cb0c84.zip |
39725: more metafication of patterns.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Src/Zle/complist.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 775ad22e6..4bdb8ff80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-10-25 Barton E. Schaefer <schaefer@zsh.org> + + * 39725: Src/Zle/complist.c: more metafication of patterns. + 2016-10-25 Peter Stephenson <p.stephenson@samsung.com> * 39723: Src/Zle/complist.c, Src/glob.c: metafy string to be diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index d4672a194..2edaf6eca 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -347,9 +347,10 @@ getcoldef(char *s) char sav = p[1]; p[1] = '\0'; + s = metafy(s, -1, META_USEHEAP); tokenize(s); gprog = patcompile(s, 0, NULL); - p[1] =sav; + p[1] = sav; s = p + 1; } @@ -415,7 +416,7 @@ getcoldef(char *s) break; *s++ = '\0'; } - p = metafy(p, strlen(p), META_USEHEAP); + p = metafy(p, -1, META_USEHEAP); tokenize(p); if ((prog = patcompile(p, 0, NULL))) { Patcol pc, po; |