X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=08940c6729770bdd122df3d99c3720f4047903c8;hb=083363e908e5ed112b05601781d500ac6909599e;hp=671e7c195715af342449e2adbb1f6274677eba26;hpb=5d7147e4efe5bfdfdc033b9f582476b2e949a0e3;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 671e7c1..08940c6 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -194,7 +194,7 @@ xcat() {
 # setup files. This should be called at the end of .zshrc.
 xunfunction() {
     local -a funcs
-    funcs=(check_com salias xcat xsource xunfunction)
+    funcs=(check_com salias xcat xsource xunfunction zrcautoload)
 
     for func in $funcs ; do
         [[ -n ${functions[$func]} ]] \
@@ -202,6 +202,28 @@ xunfunction() {
     done
     return 0
 }
+
+# autoload wrapper - use this one instead of autoload directly
+function zrcautoload() {
+    setopt local_options extended_glob
+    local fdir ffile
+    local -i ffound
+
+    ffile=${1}
+    (( found = 0 ))
+    for fdir in ${fpath} ; do
+        [[ -e ${fdir}/${ffile} ]] && (( ffound = 1 ))
+    done
+
+    (( ffound == 0 )) && return 1
+    if [[ $ZSH_VERSION == 3.1.<6-> || $ZSH_VERSION == <4->* ]] ; then
+        autoload -U ${ffile} || return 1
+    else
+        autoload ${ffile} || return 1
+    fi
+    return 0
+}
+
 #}}}
 
 # locale setup {{{
@@ -247,20 +269,25 @@ unset xof
 
 # {{{ check for version/system
 # check for versions (compatibility reasons)
-if autoload is-at-least && is-at-least 2>/dev/null ; then
-    is4()  { is-at-least 4 }
-    is41() { is-at-least 4.1 }
-    is42() { is-at-least 4.2 }
-else
-    is4(){
-        [[ $ZSH_VERSION == 4.* ]] && return 0
-        return 1
-    }
-    is42(){
-        [[ $ZSH_VERSION == 4.<2->* ]] && return 0
-        return 1
-    }
-fi
+is4(){
+    [[ $ZSH_VERSION == <4->* ]] && return 0
+    return 1
+}
+
+is41(){
+    [[ $ZSH_VERSION == 4.<1->* || $ZSH_VERSION == <5->* ]] && return 0
+    return 1
+}
+
+is42(){
+    [[ $ZSH_VERSION == 4.<2->* || $ZSH_VERSION == <5->* ]] && return 0
+    return 1
+}
+
+is43(){
+    [[ $ZSH_VERSION == 4.<3->* || $ZSH_VERSION == <5->* ]] && return 0
+    return 1
+}
 
 #f1# Checks whether or not you're running grml
 isgrml(){
@@ -304,6 +331,33 @@ isgrml && checkhome() {
         cd
     fi
 }
+
+# check for zsh v3.1.7+
+
+if ! [[ ${ZSH_VERSION} == 3.1.<7->*      \
+     || ${ZSH_VERSION} == 3.<2->.<->*    \
+     || ${ZSH_VERSION} == <4->.<->*   ]] ; then
+
+    printf '-!-\n'
+    printf '-!- In this configuration we try to make use of features, that only\n'
+    printf '-!- require version 3.1.7 of the shell; That way this setup can be\n'
+    printf '-!- used with a wide range of zsh versions, while using fairly\n'
+    printf '-!- advanced features in all supported versions.\n'
+    printf '-!-\n'
+    printf '-!- However, you are running zsh version %s.\n' "$ZSH_VERSION"
+    printf '-!-\n'
+    printf '-!- While this *may* work, it might as well fail.\n'
+    printf '-!- Please consider updating to at least version 3.1.7 of zsh.\n'
+    printf '-!-\n'
+    printf '-!- DO NOT EXPECT THIS TO WORK FLAWLESSLY!\n'
+    printf '-!- If it does today, you'\''ve been lucky.\n'
+    printf '-!-\n'
+    printf '-!- Ye been warned!\n'
+    printf '-!-\n'
+
+    function zstyle() { : }
+fi
+
 # }}}
 
 # {{{ set some variables
@@ -342,7 +396,7 @@ else
     if [[ -d /etc/zsh/functions.d ]] ; then
         fpath+=( /etc/zsh/functions.d )
         for func in /etc/zsh/functions.d/[^_]*[^~] ; do
-            autoload -U ${func:t}
+            zrcautoload -U ${func:t}
         done
     fi
 fi
@@ -398,7 +452,7 @@ bindkey '\e[8~' end-of-line             # end
 # insert unicode character
 # usage example: 'ctrl-x i' 00A7 'ctrl-x i' will give you an §
 # See for example http://unicode.org/charts/ for unicode characters code
-autoload insert-unicode-char
+zrcautoload insert-unicode-char
 zle -N insert-unicode-char
 #k# Insert Unicode character
 bindkey '^Xi' insert-unicode-char
@@ -652,8 +706,8 @@ bindkey ",." globalias
 # }}}
 
 # {{{ autoloading
-autoload -U zmv    # who needs mmv or rename?
-autoload history-search-end
+zrcautoload zmv    # who needs mmv or rename?
+zrcautoload history-search-end
 
 # we don't want to quote/espace URLs on our own...
 # if autoload -U url-quote-magic ; then
@@ -666,10 +720,10 @@ alias url-quote='autoload -U url-quote-magic ; zle -N self-insert url-quote-magi
 
 #m# k ESC-h Call \kbd{run-help} for the 1st word on the command line
 alias run-help >&/dev/null && unalias run-help
-autoload run-help # use via 'esc-h'
+zrcautoload run-help # use via 'esc-h'
 
 # completion system
-if autoload -U compinit && compinit 2>/dev/null ; then
+if zrcautoload compinit && compinit 2>/dev/null ; then
     compinit 2>/dev/null || print 'Notice: no compinit available :('
 else
     print 'Notice: no compinit available :('
@@ -677,7 +731,7 @@ else
     function compdef { }
 fi
 
-is4 && autoload -U zed # use ZLE editor to edit a file or function
+is4 && zrcautoload zed # use ZLE editor to edit a file or function
 
 is4 && \
 for mod in complist deltochar mathfunc ; do
@@ -700,7 +754,7 @@ if is4 ; then
     unset tmpargs
 fi
 
-if is4 && autoload -U insert-files && zle -N insert-files ; then
+if is4 && zrcautoload insert-files && zle -N insert-files ; then
     #k# Insert files
     bindkey "^Xf" insert-files # C-x-f
 fi
@@ -710,7 +764,7 @@ bindkey ' '   magic-space    # also do history expansion on space
 bindkey '\ei' menu-complete  # menu completion via esc-i
 
 # press esc-e for editing command line in $EDITOR or $VISUAL
-if is4 && autoload -U edit-command-line && zle -N edit-command-line ; then
+if is4 && zrcautoload edit-command-line && zle -N edit-command-line ; then
     #k# Edit the current line in \kbd{\$EDITOR}
     bindkey '\ee' edit-command-line
 fi
@@ -746,7 +800,7 @@ zle -N insert-last-typed-word;
 bindkey "\em" insert-last-typed-word
 
 # set command prediction from history, see 'man 1 zshcontrib'
-#  is4 && autoload -U predict-on && \
+#  is4 && zrcautoload predict-on && \
 #  zle -N predict-on         && \
 #  zle -N predict-off        && \
 #  bindkey "^X^Z" predict-on && \
@@ -958,7 +1012,7 @@ __vcs_dir() {
 # }}}
 
 # {{{ set prompt
-if autoload promptinit && promptinit 2>/dev/null ; then
+if zrcautoload promptinit && promptinit 2>/dev/null ; then
     promptinit # people should be able to use their favourite prompt
 else
     print 'Notice: no promptinit available :('
@@ -1033,7 +1087,7 @@ preexec () {
 }
 
 # set colors
-if autoload colors && colors 2>/dev/null ; then
+if zrcautoload colors && colors 2>/dev/null ; then
     BLUE="%{${fg[blue]}%}"
     RED="%{${fg_bold[red]}%}"
     GREEN="%{${fg[green]}%}"