ylib/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-28 20:35:17 +08:00
Code Projects Releases Wiki Activity

init: run compinit before loading lib/ files

Browse Source
This commit is contained in:
Marc Cornellà 2019-05-07 21:29:10 +02:00
parent 0f0448fa6c
commit ea3e666e04
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/directories.zsh
View File

@ -21,6 +21,7 @@ alias 9='cd -9'
alias md='mkdir -p' alias md='mkdir -p'
alias rd=rmdir alias rd=rmdir
function d () { function d () {
if [[ -n $1 ]]; then if [[ -n $1 ]]; then
dirs "$@" dirs "$@"

19
oh-my-zsh.sh
View File

@ -29,15 +29,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
fi 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() { is_plugin() {
local base_dir=$1 local base_dir=$1
local name=$2 local name=$2
@ -71,6 +62,7 @@ if [ -z "$ZSH_COMPDUMP" ]; then
fi fi
if [[ $ZSH_DISABLE_COMPFIX != true ]]; then if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
source $ZSH/lib/compfix.zsh
# If completion insecurities exist, warn the user # If completion insecurities exist, warn the user
handle_completion_insecurities handle_completion_insecurities
# Load only from secure directories # Load only from secure directories
@ -80,6 +72,15 @@ else
compinit -u -C -d "${ZSH_COMPDUMP}" compinit -u -C -d "${ZSH_COMPDUMP}"
fi 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 # Load all of the plugins that were defined in ~/.zshrc
for plugin ($plugins); do for plugin ($plugins); do
if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then