summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2016-09-21 21:27:21 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2016-09-21 21:27:21 -0700
commit18200dc03028d03047edf3efd3c7a81bbd883092 (patch)
treeb6742142bb0ea7741dbaf014a166bc4ec342515b
parent34d512a677fe64e3e9aa59f0ee9f19c3c8226ee1 (diff)
downloadzsh-18200dc03028d03047edf3efd3c7a81bbd883092.tar.gz
zsh-18200dc03028d03047edf3efd3c7a81bbd883092.zip
users/21955: add missing final colon in zstyle context lookup; allow a single unique match to appear in "expansions" tag
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Base/Completer/_user_expand4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 797fd9482..de141b8cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-09-21 Barton E. Schaefer <schaefer@brasslantern.com>
+
+ * users/21955: Completion/Base/Completer/_user_expand: add
+ missing final colon in zstyle context lookup; allow a single
+ unique match to appear in "expansions" tag
+
2016-09-21 Oliver Kiddle <opk@zsh.org>
* 39370: Completion/Zsh/Command/_typeset,
diff --git a/Completion/Base/Completer/_user_expand b/Completion/Base/Completer/_user_expand
index cf3d172f0..066e2e8e5 100644
--- a/Completion/Base/Completer/_user_expand
+++ b/Completion/Base/Completer/_user_expand
@@ -27,7 +27,7 @@ exp=("$word")
# Now look for user completions.
-zstyle -a ":completion:${curcontext}" user-expand specs || return 1
+zstyle -a ":completion:${curcontext}:" user-expand specs || return 1
for spec in $specs; do
REPLY=
@@ -95,7 +95,7 @@ if [[ -z "$compstate[insert]" ]] ;then
else
_tags all-expansions expansions original
- if [[ $#exp -gt 1 ]] && _requested expansions; then
+ if [[ $#exp -ge 1 ]] && _requested expansions; then
local i j normal space dir
if [[ "$sort" = menu ]]; then