summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2011-06-03 20:51:37 +0000
committerMikael Magnusson <mikachu@gmail.com>2011-06-03 20:51:37 +0000
commit0bff0b356ca7050280ebe02a588d74a95c7e7f5c (patch)
tree609209e548420f75d19058084129767567915305
parent12e246495c2f40ca289b27a552d548318f255472 (diff)
downloadzsh-0bff0b356ca7050280ebe02a588d74a95c7e7f5c.tar.gz
zsh-0bff0b356ca7050280ebe02a588d74a95c7e7f5c.zip
29438: complete dynamic directory names in command position
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Zsh/Context/_subscript2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index abc2736e1..eae0213a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-03 Mikael Magnusson <mikachu@gmail.com>
+
+ * 29438: Completion/Zsh/Context/_subscript: adjust pattern so
+ we complete dynamic directory names in command position as well.
+
2011-06-03 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 29413: Doc/Zsh/builtins.yo, Src/builtin.c, Src/hist.c: print
@@ -14931,5 +14936,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5356 $
+* $Revision: 1.5357 $
*****************************************************
diff --git a/Completion/Zsh/Context/_subscript b/Completion/Zsh/Context/_subscript
index 31da97e26..cf1ec49a4 100644
--- a/Completion/Zsh/Context/_subscript
+++ b/Completion/Zsh/Context/_subscript
@@ -18,7 +18,7 @@ compset -P '\(([^\(\)]|\(*\))##\)' # remove subscript flags
# or colon list.
integer pos=$((CURSOR+1))
while [[ pos -gt 1 && $BUFFER[pos-1] != '[' ]]; do (( pos-- )); done
-if [[ $BUFFER[1,pos-1] = *[[:space:]:=]##\~\[ ]]; then
+if [[ $BUFFER[1,pos-1] = (|*[[:space:]:=]##)\~\[ ]]; then
_dynamic_directory_name
elif [[ "$PREFIX" = :* ]]; then
_wanted characters expl 'character class' \