From 6ccf67a077e07bc57cdca6980dcdf346cbd2138e Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Mon, 16 Feb 2015 10:24:22 -0500 Subject: [PATCH 1/3] Do not put explicit dot in $cdpath, since it causes problems on Cygwin due to an underlying zsh bug. --- lib/completion.zsh | 1 - 1 file changed, 1 deletion(-) 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 From bc8abe5ea26aa031395c754e3e9710dcc62dd0f0 Mon Sep 17 00:00:00 2001 From: Brian Derr Date: Thu, 19 Feb 2015 13:30:50 -0800 Subject: [PATCH 2/3] Verify zle is active before trying to reset-prompt. --- plugins/vi-mode/vi-mode.plugin.zsh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh index f2745b409..ac9233290 100644 --- a/plugins/vi-mode/vi-mode.plugin.zsh +++ b/plugins/vi-mode/vi-mode.plugin.zsh @@ -17,8 +17,12 @@ 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 + # Verify that zle is active before trying to reset-prompt. + zle + if [[ $? -eq 0 ]]; then + zle reset-prompt + zle -R + fi fi } From d7837c6041b1099982e3f278b50e8868b8b30ff9 Mon Sep 17 00:00:00 2001 From: Brian Derr Date: Sat, 21 Feb 2015 18:08:54 -0800 Subject: [PATCH 3/3] Shorten the zle check and reset-prompt into one line. --- plugins/vi-mode/vi-mode.plugin.zsh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh index ac9233290..80df97d61 100644 --- a/plugins/vi-mode/vi-mode.plugin.zsh +++ b/plugins/vi-mode/vi-mode.plugin.zsh @@ -16,14 +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 - # Verify that zle is active before trying to reset-prompt. - zle - if [[ $? -eq 0 ]]; then - zle reset-prompt - zle -R - fi - fi + zle && { zle reset-prompt; zle -R } } zle -N zle-line-init