Overhaul of the entire config. Yay for big diffs.

[etc/zsh.git] / .zsh / sourcedir

diff --git a/.zsh/sourcedir b/.zsh/sourcedir
index cd89e2cddb3538a5305abbee30a500892b55dfe9..9b9803d03d051573a27d307cecb8fa9b3946480b 100644 (file)
--- a/.zsh/sourcedir
+++ b/.zsh/sourcedir
@@ -2,7 +2,7 @@
 #
 # Defines helper function to source files in a directory
 #
 #
 # Defines helper function to source files in a directory
 #

-# Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
+# Copyright © 1994–2017 martin f. krafft <madduck@madduck.net>

 # Released under the terms of the Artistic Licence 2.0
 #
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 # Released under the terms of the Artistic Licence 2.0
 #
 # Source repository: http://git.madduck.net/v/etc/zsh.git


@@ -12,15 +12,18 @@
 
 sourcedir() {
   if [ ! -d "$1" ]; then
 
 sourcedir() {
   if [ ! -d "$1" ]; then

+    zerror "no such directory: $1"

     return 1
   fi
     return 1
   fi

-  debug "sourcing directory ${1#$ZDOTDIR/}"
-  for f in "$1"/*(.N); do
+#  zdebug "sourcing directory ${1#$ZDOTDIR/}"
+  for f in "$1"/*(.N,@N); do

     case "$f" in
     case "$f" in

-      *~|*.bak|*.sw?|*.zwc|*.disabled) continue;;
+      *~|*.bak|*.old|*.sw?|*.zwc|*.disabled) continue;;
+      *-BREAK_HERE)
+        break;;

     esac
     esac

-    debug "  sourcing file $f"
-    . "$f"
+#    zdebug "  sourcing file $f"
+    source "$f"

   done
 }
 
   done
 }