diff options
| author | Robby Russell <robby@planetargon.com> | 2015-02-22 09:29:41 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-02-22 09:29:41 -0800 |
| commit | 6713aef977b00577eb24512c7d41d8b55888a140 (patch) | |
| tree | af57e3bb6760ae997548dd31b1b92ef02fc6a0b1 | |
| parent | aa16e18644b3fee0b3cf0320692d6566d539cdd0 (diff) | |
| parent | 7b71dccbaff4a9bb72fc069407723d2ecb7c0eae (diff) | |
| download | zsh-6713aef977b00577eb24512c7d41d8b55888a140.tar.gz zsh-6713aef977b00577eb24512c7d41d8b55888a140.tar.bz2 zsh-6713aef977b00577eb24512c7d41d8b55888a140.zip | |
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
| -rw-r--r-- | lib/completion.zsh | 1 | ||||
| -rw-r--r-- | plugins/vi-mode/vi-mode.plugin.zsh | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh index ea6139fde..4b1bb0a62 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -34,7 +34,6 @@ fi # disable named-directories autocompletion zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories -cdpath=(.) # Use caching so that commands like apt and dpkg complete are useable zstyle ':completion::complete:*' use-cache 1 diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh index 1de8bf91a..4424bb29a 100644 --- a/plugins/vi-mode/vi-mode.plugin.zsh +++ b/plugins/vi-mode/vi-mode.plugin.zsh @@ -16,10 +16,7 @@ function zle-keymap-select zle-line-init zle-line-finish { # Ensure that the prompt is redrawn when the terminal size changes. TRAPWINCH() { - if [[ -o zle ]]; then - zle reset-prompt - zle -R - fi + zle && { zle reset-prompt; zle -R } } zle -N zle-line-init |