diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | Completion/Zsh/Context/_brace_parameter | 2 | ||||
| -rw-r--r-- | Config/version.mk | 4 | ||||
| -rw-r--r-- | Doc/Zsh/compsys.yo | 9 | ||||
| -rw-r--r-- | Src/Zle/compmatch.c | 2 | ||||
| -rw-r--r-- | Src/builtin.c | 2 | ||||
| -rw-r--r-- | Test/Y03arguments.ztst | 19 |
7 files changed, 40 insertions, 15 deletions
@@ -1,3 +1,20 @@ +2016-12-10 Barton E. Schaefer <schaefer@zsh.org> + + * 40134: Src/builtin.c, Src/Zle/compmatch.c: silence spurious + compiler warnings. + +2016-12-10 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 40139: Test/Y03arguments.ztst: tests: Convert comments to + diagnostics; test backslashes. (after 40129) + + * users/22182: Completion/Zsh/Context/_brace_parameter: Propagate + 22161 docs patch to completion descriptions. + +2016-12-09 Oliver Kiddle <opk@zsh.org> + + * 40137: Doc/Zsh/compsys.yo: document _external_pwds + 2016-12-09 Peter Stephenson <p.w.stephenson@ntlworld.com> * unposted: Config/version.mk: 5.2-test-3. diff --git a/Completion/Zsh/Context/_brace_parameter b/Completion/Zsh/Context/_brace_parameter index e4f5e6639..aa1572176 100644 --- a/Completion/Zsh/Context/_brace_parameter +++ b/Completion/Zsh/Context/_brace_parameter @@ -179,7 +179,7 @@ if [[ $PREFIX = *'${('[^\)]# ]]; then "S:search substrings in #, %, / expressions" "I:search <argument>th match in #, %, / expressions" "B:include index of beginning of match in #, %, / expressions" - "E:include index of end of match in #, %, / expressions" + "E:include index of one past end of match in #, %, / expressions" "M:include matched portion in #, %, / expressions" "N:include length of match in #, % expressions" "R:include rest (unmatched portion) in #, %, / expressions" diff --git a/Config/version.mk b/Config/version.mk index 7aca34cb3..45558e39d 100644 --- a/Config/version.mk +++ b/Config/version.mk @@ -27,5 +27,5 @@ # This must also serve as a shell script, so do not add spaces around the # `=' signs. -VERSION=5.2-test-3 -VERSION_DATE='December 9, 2016' +VERSION=5.3 +VERSION_DATE='December 11, 2016' diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo index ceb98c7bc..953d51c4c 100644 --- a/Doc/Zsh/compsys.yo +++ b/Doc/Zsh/compsys.yo @@ -3123,6 +3123,15 @@ completion continues to allow other completers such as tt(_expand) to expand the pattern. The standard tt(add-space) and tt(prefix-hidden) styles are observed. ) +findex(_external_pwds) +item(tt(_external_pwds))( +Completes current directories of other zsh processes belonging to the +current user. + +This is intended to be used via tt(_generic), bound to a custom key +combination. Note that pattern matching is enabled so matching is +performed similar to how it works with the tt(_match) completer. +) findex(_history) item(tt(_history))( Complete words from the shell's command history. This completer diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index f82f00e1d..aedf463fc 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -674,7 +674,7 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, * * operation. Similar to savw. */ - char savl; + char savl = 0; /* * The anchor on this end. */ diff --git a/Src/builtin.c b/Src/builtin.c index e641a97a1..65e0cb10b 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -4092,7 +4092,7 @@ bin_print(char *name, char **args, Options ops, int func) char *start, *endptr, *c, *d, *flag, *buf = NULL, spec[14], *fmt = NULL; char **first, **argp, *curarg, *flagch = "'0+- #", save = '\0', nullstr = '\0'; size_t rcount = 0, count = 0; - size_t *cursplit, *splits = 0; + size_t *cursplit = 0, *splits = 0; FILE *fout = stdout; #ifdef HAVE_OPEN_MEMSTREAM size_t mcount; diff --git a/Test/Y03arguments.ztst b/Test/Y03arguments.ztst index b5a5a4be9..6f0cac034 100644 --- a/Test/Y03arguments.ztst +++ b/Test/Y03arguments.ztst @@ -40,14 +40,13 @@ >NO:{a} >NO:{b} -# it ought to be possible to include the quoted backslash here - tst_arguments ':desc2:((a\:a\ value b\:other\\value))' + tst_arguments ':desc2:((a\:a\ value b\:other\\\\value))' comptest $'tst \t' 0:a and b with descriptions >line: {tst }{} >DESCRIPTION:{desc2} >NO:{a -- a value} ->NO:{b -- othervalue} +>NO:{b -- other\value} tst_arguments ':desc1:(arg1)' ':desc2:(arg2)' ':desc3:(arg3)' comptest $'tst \t\t\t\C-w\C-w\C-w\C-d' @@ -430,7 +429,6 @@ >line: {tst -h -}{} >MESSAGE:{no arguments} -# this would ideally not offer -b as it is already on the command-line tst_arguments -a '(-a)-b' comptest $'tst - -b\C-b\C-b\C-b\t' 0:exclusion only applies to later words @@ -438,8 +436,8 @@ >DESCRIPTION:{option} >NO:{-a} >NO:{-b} +F:shouldn't offer -b as it is already on the command-line -# ideally, would handle exclusion within the current word tst_arguments -s : '(-d)-a' -b -c -d comptest $'tst -ab\t -\t\eb\eb \C-b-\t' 0:exclusion with clumped options, in, after and before @@ -454,17 +452,18 @@ >NO:{-b} >NO:{-c} >NO:{-d} +F:the first tab press shouldn't offer -d since -a is on the command line tst_arguments '-a:arg' -b '(-b)-c' comptest $'tst -a -c -\t' 0:exclusion with option argument that looks like an option >line: {tst -a -c -}{} >MESSAGE:{no arguments} -# seems we don't handle this case, ideal result would be as follows -#>line: {tst -a -c -}{} -#>DESCRIPTION:{option} -#>NO:{-b} -#>NO:{-c} +F:The current behaviour is wrong; the correct expected output is: +F:>line: {tst -a -c -}{} +F:>DESCRIPTION:{option} +F:>NO:{-b} +F:>NO:{-c} tst_arguments --abc --aah :arg: comptesteval 'setopt bashautolist automenu' |