summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Zsh/Type/_directory_stack6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9401b7f92..b09a021f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2015-07-22 Barton E. Schaefer <schaefer@zsh.org>
+ * unposted: Completion/Zsh/Type/_directory_stack: move some more
+ recent code so an old comment is connected to the correct bit of
+ older code
+
+ * users/20324: Completion/Zsh/Type/_directory_stack: add (D) flag
+ for tilde-fied completion listing
+
* 35826: Src/Modules/newuser.c, Src/Modules/zftp.c,
Src/Zle/complist.c, Src/Zle/zle_misc.c, Src/init.c, Src/params.c,
Src/utils.c, Src/watch.c: add getsparam_u() to return unmetafied
diff --git a/Completion/Zsh/Type/_directory_stack b/Completion/Zsh/Type/_directory_stack
index 8a4cf675a..e84115a64 100644
--- a/Completion/Zsh/Type/_directory_stack
+++ b/Completion/Zsh/Type/_directory_stack
@@ -12,14 +12,14 @@ local expl list lines revlines disp sep
### we decided against this, for now...
#! zstyle -T ":completion:${curcontext}:directory-stack" prefix-needed ||
-zstyle -s ":completion:${curcontext}:directory-stack" list-separator sep || sep=--
-
[[ $PREFIX = [-+]* ]] || return 1
+zstyle -s ":completion:${curcontext}:directory-stack" list-separator sep || sep=--
+
if zstyle -T ":completion:${curcontext}:directory-stack" verbose; then
# get the list of directories with their canonical number
# and turn the lines into an array, removing the current directory
- lines=("${dirstack[@]}")
+ lines=("${(D)dirstack[@]}")
if [[ ( $PREFIX[1] = - && ! -o pushdminus ) ||
( $PREFIX[1] = + && -o pushdminus ) ]]; then