Merge db981edc66 into 468f99adfe

init.zsh

@@ -36,7 +36,7 @@ fi
     if [[ ! -d ${zmodule_dir} ]]; then
       print "No such module \"${zmodule}\"." >&2
     else
-      for zmodule_file (${zmodule_dir}/init.zsh \
+      for zmodule_file (${zmodule_dir}/init.{zsh,sh} \
           ${zmodule_dir}/{,zsh-}${zmodule}.{zsh,plugin.zsh,zsh-theme,sh}); do
         if [[ -f ${zmodule_file} ]]; then
           source ${zmodule_file}

login_init.zsh

@@ -23,32 +23,23 @@
     zrecompile -pq ${dir}.zwc ${dir}/^([_.]*|prompt_*_setup|README*|*.zwc|*.zwc.old)(-.N)
   done
 
-  # zcompile enabled module init scripts
+  # zcompile enabled module init scripts and subdirs
+  setopt nullglob
   for zmodule (${zmodules}); do
     zmodule_dir=${ZIM_HOME}/modules/${zmodule}
     if [[ -d ${zmodule_dir} ]]; then
-      for file (${zmodule_dir}/init.zsh \
+      for file (${zmodule_dir}/**/*.{zsh,sh,zsh-theme} \
-          ${zmodule_dir}/{,zsh-}${zmodule}.{zsh,plugin.zsh,zsh-theme,sh}); do
+          ${zmodule_dir}/*.{zsh,sh,zsh-theme}); do
         if [[ -f ${file} ]]; then
           zrecompile -pq ${file}
-          break
         fi
       done
     fi
   done
-
+  unsetopt nullglob
   # zcompile all prompt setup scripts
   for file in ${ZIM_HOME}/modules/prompt/functions/prompt_*_setup; do
     zrecompile -pq ${file}
   done
-
+  
-  # syntax-highlighting
-  for file in ${ZIM_HOME}/modules/syntax-highlighting/external/highlighters/**^test-data/*.zsh; do
-    zrecompile -pq ${file}
-  done
-  zrecompile -pq ${ZIM_HOME}/modules/syntax-highlighting/external/zsh-syntax-highlighting.zsh
-
-  # zsh-histery-substring-search
-  zrecompile -pq ${ZIM_HOME}/modules/history-substring-search/external/zsh-history-substring-search.zsh
-
 ) &!