From ea3e666e04bfae31b37ef42dfe54801484341e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 7 May 2019 21:29:10 +0200
Subject: [PATCH] init: run compinit before loading lib/ files

---
 lib/directories.zsh |  1 +
 oh-my-zsh.sh        | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index 355c442d2..cf87bd7e4 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -21,6 +21,7 @@ alias 9='cd -9'
 
 alias md='mkdir -p'
 alias rd=rmdir
+
 function d () {
   if [[ -n $1 ]]; then
     dirs "$@"
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index b1460b1d7..6b2662d5e 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -29,15 +29,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
 fi
 
 
-# Load all of the config files in ~/oh-my-zsh that end in .zsh
-# TIP: Add files you don't want in git to .gitignore
-for config_file ($ZSH/lib/*.zsh); do
-  custom_config_file="${ZSH_CUSTOM}/lib/${config_file:t}"
-  [ -f "${custom_config_file}" ] && config_file=${custom_config_file}
-  source $config_file
-done
-
-
 is_plugin() {
   local base_dir=$1
   local name=$2
@@ -71,6 +62,7 @@ if [ -z "$ZSH_COMPDUMP" ]; then
 fi
 
 if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
+  source $ZSH/lib/compfix.zsh
   # If completion insecurities exist, warn the user
   handle_completion_insecurities
   # Load only from secure directories
@@ -80,6 +72,15 @@ else
   compinit -u -C -d "${ZSH_COMPDUMP}"
 fi
 
+
+# Load all of the config files in ~/oh-my-zsh that end in .zsh
+# TIP: Add files you don't want in git to .gitignore
+for config_file ($ZSH/lib/*.zsh); do
+  custom_config_file="${ZSH_CUSTOM}/lib/${config_file:t}"
+  [ -f "${custom_config_file}" ] && config_file=${custom_config_file}
+  source $config_file
+done
+
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
   if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then