Catch some more potentially unset parameters

Fixes #344.
marlonrichert · Sep 25, 2021 · f208d04 · f208d04
1 parent b0d6753
commit f208d04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/.autocomplete.compinit b/scripts/.autocomplete.compinit
@@ -21,7 +21,7 @@ compdef() {
   emulate -L zsh
   setopt $_autocomplete__func_opts[@]
 
-  [[ -z $CDPATH ]] &&
+  [[ -v CDPATH && -z $CDPATH ]] &&
       unset CDPATH cdpath
 
   # Decrease Oh My Zsh start-up time. See below.

diff --git a/scripts/.autocomplete.key-binding b/scripts/.autocomplete.key-binding
@@ -14,8 +14,8 @@ zmodload -F zsh/parameter p:funcstack p:functions
   builtin zstyle -s :autocomplete:tab: widget-style tab_style ||
       tab_style='complete-word'
 
-  if  builtin zstyle -t :autocomplete:tab: fzf ||
-      builtin zstyle -t :autocomplete:tab: fzf-completion; then
+  if builtin zstyle -t :autocomplete:tab: fzf-completion &&
+      [[ -v functions[fzf-completion] ]]; then
     typeset -gH fzf_default_completion=$tab_style
     functions[.autocomplete.fzf-completion]=$functions[fzf-completion]
     fzf-completion() {