6713aef977b00577eb24512c7d41d8b55888a140

 1diff --git a/lib/completion.zsh b/lib/completion.zsh
 2index ea6139fde2ad8d83952be42f4c33347423ebcc87..4b1bb0a6248504714afadf14960831e31f2ef411 100644
 3--- a/lib/completion.zsh
 4+++ b/lib/completion.zsh
 5@@ -34,7 +34,6 @@ fi
 6 
 7 # disable named-directories autocompletion
 8 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
 9-cdpath=(.)
10 
11 # Use caching so that commands like apt and dpkg complete are useable
12 zstyle ':completion::complete:*' use-cache 1
13diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
14index 1de8bf91a9b025a39beed35f3d296826e8d541f5..4424bb29af2a5751ba33e5ef604e41aba6bb4bc8 100644
15--- a/plugins/vi-mode/vi-mode.plugin.zsh
16+++ b/plugins/vi-mode/vi-mode.plugin.zsh
17@@ -16,10 +16,7 @@ function zle-keymap-select zle-line-init zle-line-finish {
18 
19 # Ensure that the prompt is redrawn when the terminal size changes.
20 TRAPWINCH() {
21-  if [[ -o zle ]]; then
22-    zle reset-prompt
23-    zle -R
24-  fi
25+  zle && { zle reset-prompt; zle -R }
26 }
27 
28 zle -N zle-line-init