diff options
author | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
---|---|---|
committer | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
commit | db90589c8a02e98e657af17bb0b460b752d9ed61 (patch) | |
tree | d1354a9338bf9921ad0f66d2f5394272e1cfec77 /lib/completion.zsh | |
parent | 7066bf7c6b522af9147ebf03c00361c4c6490d42 (diff) | |
parent | 57f04b921ea1c12a0a283331778848cd4011bf21 (diff) | |
download | zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.gz zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.bz2 zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.zip |
Merge remote-tracking branch 'upstream/master' into emacs
Conflicts:
plugins/emacs/emacs.plugin.zsh
plugins/emacs/emacsclient.sh
Diffstat (limited to 'lib/completion.zsh')
-rw-r--r-- | lib/completion.zsh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh index e8e9776a5..b3cc91822 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -4,14 +4,10 @@ unsetopt menu_complete # do not autoselect the first completion entry unsetopt flowcontrol setopt auto_menu # show completion menu on succesive tab press setopt complete_in_word -setopt complete_aliases setopt always_to_end WORDCHARS='' -autoload -U compinit -compinit -i - zmodload -i zsh/complist ## case-insensitive (all),partial-word and then substring completion @@ -63,3 +59,12 @@ zstyle ':completion:*:*:*:users' ignored-patterns \ # ... unless we really want to. zstyle '*' single-ignored show +if [ "x$COMPLETION_WAITING_DOTS" = "xtrue" ]; then + expand-or-complete-with-dots() { + echo -n "\e[31m......\e[0m" + zle expand-or-complete + zle redisplay + } + zle -N expand-or-complete-with-dots + bindkey "^I" expand-or-complete-with-dots +fi |