Source Mage code commit list

[Andraž Levstik <scm AT sourcemage.org>]

GIT changes to master grimoire by Andraž Levstik <ruskie AT codemages.net>:

 shell-term-fm/zsh/HISTORY               |    7 +++++++
 shell-term-fm/zsh/functions/_cast       |    6 +++---
 shell-term-fm/zsh/functions/_scribe     |    4 ++--
 shell-term-fm/zsh/functions/_spells     |    7 +++++--
 shell-term-fm/zsh/functions/_summon_url |   10 +++++-----
 5 files changed, 22 insertions(+), 12 deletions(-)

New commits:
commit 93391f964944e9aba3bc2d4d5ebd602607a5dc1d
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>

    zsh: fixed and updated tab completion for source mage, could do with some 
more fixups but atm beyond my skills

diff --git a/shell-term-fm/zsh/HISTORY b/shell-term-fm/zsh/HISTORY
index 2d4b87b..5d2612b 100644
--- a/shell-term-fm/zsh/HISTORY
+++ b/shell-term-fm/zsh/HISTORY
@@ -1,3 +1,10 @@
+2008-12-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * functions/_cast: added all the possible url_ ://
+       * functions/_scribe: added all the possible url_ ://
+       * functions/_spells: fixed spell tab completion, still limited to
+         default config only
+       * functions/_summon_url: added all the possible url_ ://
+
 2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/shell-term-fm/zsh/functions/_cast 
b/shell-term-fm/zsh/functions/_cast
index b8fce3b..46ee007 100644
--- a/shell-term-fm/zsh/functions/_cast
+++ b/shell-term-fm/zsh/functions/_cast
@@ -37,10 +37,10 @@ _cast () {
       _directories && ret=0
       ;;
     url)
-      if [[ -prefix 1 (f|ht)tp:// ]]; then
-         _urls -f && ret=0
+      if [[ -prefix 1 
(svn|svn_ssh|file|dir|cvs|rsync|smgl_tla|svn_http|svn_https|git|git_http|git_local|ftp|http|hg_http)://
 ]]; then
+        _urls -f && ret=0
       else
-        compadd -S '' ftp:// http:// && ret=0
+        compadd -S '' ftp:// http:// svn:// svn_ssh:// file:// dir:// cvs:// 
rsync:// smgl_tla:// svn_http:// svn_https:// git:// git_http:// git_local:// 
hg_http://
       fi
       ;;
     esac
diff --git a/shell-term-fm/zsh/functions/_scribe 
b/shell-term-fm/zsh/functions/_scribe
index a869c83..49d8eba 100644
--- a/shell-term-fm/zsh/functions/_scribe
+++ b/shell-term-fm/zsh/functions/_scribe
@@ -25,10 +25,10 @@ _scribe_command () {
     
   elif (( CURRENT == 4 )); then
     if [[ "${words[3]}" == from ]]; then
-       if [[ -prefix 1 (f|ht)tp:// ]]; then
+       if [[ -prefix 1 
(svn|svn_ssh|file|dir|cvs|rsync|smgl_tla|svn_http|svn_https|git|git_http|git_local|ftp|http|hg_http)://
 ]]; then
            _urls -f
        else
-           compadd -S '' ftp:// http://
+           compadd -S '' ftp:// http:// svn:// svn_ssh:// file:// dir:// 
cvs:// rsync:// smgl_tla:// svn_http:// svn_https:// git:// git_http:// 
git_local:// hg_http://
        fi
     else
        false
diff --git a/shell-term-fm/zsh/functions/_spells 
b/shell-term-fm/zsh/functions/_spells
index 57b3681..1130576 100644
--- a/shell-term-fm/zsh/functions/_spells
+++ b/shell-term-fm/zsh/functions/_spells
@@ -1,8 +1,11 @@
 #autoload
 
 #Define global values
-if (( ! $+GRIMOIRE_DIR )); then
-    typeset `grep " GRIMOIRE_LIST=" /etc/sorcery/config`
+#this restores the existing functionality without taking into account
+#the recent sorcery config changes
+if (( ! $+GRIMOIRE_DIR )) ; then
+    typeset $(grep " GRIMOIRE_LIST=" /etc/sorcery/config | sed 
"s/.*GRIMOIRE_LIST=.*:-\(.*\)}/GRIMOIRE_LIST=\1/g")
+
     typeset -gA GRIMOIRE_DIR
     . $GRIMOIRE_LIST
 fi
diff --git a/shell-term-fm/zsh/functions/_summon_url 
b/shell-term-fm/zsh/functions/_summon_url
index e75b6bf..7d8b749 100644
--- a/shell-term-fm/zsh/functions/_summon_url
+++ b/shell-term-fm/zsh/functions/_summon_url
@@ -4,11 +4,11 @@
 # summon --url
 
 if [[ ${words[$(( $CURRENT-1 ))]} == --url ]]; then
-    if [[ -prefix 1 (f|ht)tp:// ]]; then
-       _urls -f && ret=0
-    else
-       compadd -S '' ftp:// http://
-    fi
+  if [[ -prefix 1 
(svn|svn_ssh|file|dir|cvs|rsync|smgl_tla|svn_http|svn_https|git|git_http|git_local|ftp|http|hg_http)://
 ]]; then
+    _urls -f && ret=0
+  else
+    compadd -S '' ftp:// http:// svn:// svn_ssh:// file:// dir:// cvs:// 
rsync:// smgl_tla:// svn_http:// svn_https:// git:// git_http:// git_local:// 
hg_http://
+  fi
 else
     _spells
 fi