From 44c56f3af57d93d5d92ce18893cb020f8f36e2f3 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Mon, 29 Jun 2015 01:53:59 +0200 Subject: 35627: make reverse-menu-complete start with the last match in menu selection --- Src/Zle/complete.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'Src/Zle/complete.c') diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c index ea5e41f5f..63e5b9184 100644 --- a/Src/Zle/complete.c +++ b/Src/Zle/complete.c @@ -1625,7 +1625,6 @@ boot_(Module m) addhookfunc("before_complete", (Hookfn) before_complete); addhookfunc("after_complete", (Hookfn) after_complete); addhookfunc("accept_completion", (Hookfn) accept_last); - addhookfunc("reverse_menu", (Hookfn) reverse_menu); addhookfunc("list_matches", (Hookfn) list_matches); addhookfunc("invalidate_list", (Hookfn) invalidate_list); (void)addhookdefs(m, comphooks, sizeof(comphooks)/sizeof(*comphooks)); @@ -1640,7 +1639,6 @@ cleanup_(Module m) deletehookfunc("before_complete", (Hookfn) before_complete); deletehookfunc("after_complete", (Hookfn) after_complete); deletehookfunc("accept_completion", (Hookfn) accept_last); - deletehookfunc("reverse_menu", (Hookfn) reverse_menu); deletehookfunc("list_matches", (Hookfn) list_matches); deletehookfunc("invalidate_list", (Hookfn) invalidate_list); (void)deletehookdefs(m, comphooks, -- cgit v1.2.3 From 38145b255a941098a92ded3647f70be977483fa9 Mon Sep 17 00:00:00 2001 From: Han Pingtian Date: Wed, 1 Jul 2015 16:34:40 +0800 Subject: 35665: better handling for command line completion match handling --- ChangeLog | 3 +++ Src/Zle/complete.c | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'Src/Zle/complete.c') diff --git a/ChangeLog b/ChangeLog index 99b779252..03747ead0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-07-02 Peter Stephenson + * Han Pingtian: 35665: Src/Zle/complete.c: better error handling + for command line match processing. + * Eric Cook: 35663: Completion/Unix/Command/_zpool: fix for changed interface. diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c index 63e5b9184..471c9f491 100644 --- a/Src/Zle/complete.c +++ b/Src/Zle/complete.c @@ -268,7 +268,10 @@ parse_cmatcher(char *name, char *s) if (!*s || !*++s) { if (name) - zwarnnam(name, "missing line pattern"); + if (both) + zwarnnam(name, "missing right anchor"); + else + zwarnnam(name, "missing line pattern"); return pcm_err; } } else @@ -288,6 +291,7 @@ parse_cmatcher(char *name, char *s) if ((fl & CMF_RIGHT) && !fl2 && (!*s || !*++s)) { if (name) zwarnnam(name, "missing right anchor"); + return pcm_err; } else if (!(fl & CMF_RIGHT) || fl2) { if (!*s) { if (name) @@ -313,8 +317,7 @@ parse_cmatcher(char *name, char *s) return pcm_err; } s++; - } else - right = NULL; + } if (*s == '*') { if (!(fl & (CMF_LEFT | CMF_RIGHT))) { -- cgit v1.2.3 From 68a5a5f453d9534748e12d268718a97b7e84c31b Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Mon, 6 Jul 2015 22:40:47 +0200 Subject: 35704: compadd -E 0 should imply -J and -2 --- ChangeLog | 5 +++++ Doc/Zsh/compwid.yo | 4 +++- Src/Zle/compcore.c | 4 ++-- Src/Zle/complete.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'Src/Zle/complete.c') diff --git a/ChangeLog b/ChangeLog index 947d8b333..a7eb45224 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-07-06 Oliver Kiddle + + * 35704: Doc/Zsh/compwid.yo, Src/Zle/compcore.c, Src/Zle/complete.c; + compadd -E 0 should imply -J and -2 + 2015-07-06 Mikael Magnusson * 35696: Completion/Unix/Type/_ps1234: complete colors for %F{ diff --git a/Doc/Zsh/compwid.yo b/Doc/Zsh/compwid.yo index 0c0a15d41..40cabea88 100644 --- a/Doc/Zsh/compwid.yo +++ b/Doc/Zsh/compwid.yo @@ -697,7 +697,9 @@ format completion lists and to make explanatory string be shown in completion lists (since empty matches can be given display strings with the tt(-d) option). And because all but one empty string would otherwise be removed, this option implies the tt(-V) and tt(-2) -options (even if an explicit tt(-J) option is given). +options (even if an explicit tt(-J) option is given). This can be +important to note as it affects the name space into which matches are +added. ) xitem(tt(-)) item(tt(-)tt(-))( diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index ba538ca99..ae3a64074 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -2049,7 +2049,7 @@ addmatches(Cadata dat, char **argv) Heap oldheap; SWITCHHEAPS(oldheap, compheap) { - if (dat->dummies) + if (dat->dummies >= 0) dat->aflags = ((dat->aflags | CAF_NOSORT | CAF_UNIQCON) & ~CAF_UNIQALL); @@ -2534,7 +2534,7 @@ addmatches(Cadata dat, char **argv) addmatch("", dat->flags | CMF_ALL, &disp, 1); hasallmatch = 1; } - while (dat->dummies--) + while (dat->dummies-- > 0) addmatch("", dat->flags | CMF_DUMMY, &disp, 0); } SWITCHBACKHEAPS(oldheap); diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c index 471c9f491..30173927d 100644 --- a/Src/Zle/complete.c +++ b/Src/Zle/complete.c @@ -540,7 +540,7 @@ bin_compadd(char *name, char **argv, UNUSED(Options ops), UNUSED(int func)) dat.match = NULL; dat.flags = 0; dat.aflags = CAF_MATCH; - dat.dummies = 0; + dat.dummies = -1; for (; *argv && **argv == '-'; argv++) { if (!(*argv)[1]) { -- cgit v1.2.3 From 04675eca4ce9396d1efd0563b2b786f5bc6d66ed Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Tue, 7 Jul 2015 12:48:30 +0100 Subject: unposted: remove compiler error in completion code --- ChangeLog | 4 ++++ Src/Zle/complete.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'Src/Zle/complete.c') diff --git a/ChangeLog b/ChangeLog index 27335d8f0..1f4e3f999 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-07-07 Peter Stephenson + + * unposted: Src/Zle/complete.c: remove compiler warning. + 2015-07-06 Barton E. Schaefer * unposted: Doc/Zsh/expn.yo: alphabetize ${(b)...} flag diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c index 30173927d..ee4e5b0a5 100644 --- a/Src/Zle/complete.c +++ b/Src/Zle/complete.c @@ -267,11 +267,12 @@ parse_cmatcher(char *name, char *s) s++; if (!*s || !*++s) { - if (name) + if (name) { if (both) zwarnnam(name, "missing right anchor"); else zwarnnam(name, "missing line pattern"); + } return pcm_err; } } else -- cgit v1.2.3