tempfuncs can now incorporate a keyword into the file/dirname

[etc/zsh.git] / .zsh / zshrc / 30_aliases

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index f206c8c8bfeaf777a6f4ebef5ea4b54746376b7e..fd8dd2429cefc41d261fd055dfc8da16f0de7be7 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -45,7 +45,7 @@ alias lart='ls -lart'
 # List only directories and symbolic links that point to directories
 alias lsd='ll -d *(-/DN)'
 
 # List only directories and symbolic links that point to directories
 alias lsd='ll -d *(-/DN)'
 

-alias lscontext=l
+alias lscontext=ls

 cd () { __CHPWD_RUN_FIRST=lscontext && builtin cd "$@" && unset __CHPWD_RUN_FIRST }
 #_cd_l() { ll }
 #chpwd_functions+=_cd_l
 cd () { __CHPWD_RUN_FIRST=lscontext && builtin cd "$@" && unset __CHPWD_RUN_FIRST }
 #_cd_l() { ll }
 #chpwd_functions+=_cd_l


@@ -74,6 +74,12 @@ doc() { cd /usr/share/doc/$1 }
 compdef '_files -W /usr/share/doc -/' doc
 
 alias giti='git init && git add . && git commit -minitial\ checkin && git tag orig'
 compdef '_files -W /usr/share/doc -/' doc
 
 alias giti='git init && git add . && git commit -minitial\ checkin && git tag orig'

+gbs() {
+  local branch; branch="$(git symbolic-ref -q HEAD)"; branch="${branch##*/}"
+  git config branch.${branch}.remote ${1:-origin}
+  git config branch.${branch}.merge refs/heads/${branch}
+  git config branch.${branch}.rebase true
+}

 
 if whence mtail >/dev/null; then
   alias t=mtail
 
 if whence mtail >/dev/null; then
   alias t=mtail


@@ -137,16 +143,16 @@ _LANGUAGES[de]=deu
 _LANGUAGES[es]=spa
 _LANGUAGES[fr]=fra
 _LANGUAGES[it]=ita
 _LANGUAGES[es]=spa
 _LANGUAGES[fr]=fra
 _LANGUAGES[it]=ita

-_LANGUAGES[lt]=lat
+_LANGUAGES[tn]=lat

 for l0 in ${(k)_LANGUAGES}; do
   for l1 in ${(k)_LANGUAGES}; do
 for l0 in ${(k)_LANGUAGES}; do
   for l1 in ${(k)_LANGUAGES}; do

-    eval "_${l0}-${l1}() { _d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
-    eval "${l0}-${l1}() { d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
+    eval "function _${l0}-${l1}() { _d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"
+    eval "function ${l0}-${l1}() { d -d fd-${_LANGUAGES[$l0]}-${_LANGUAGES[$l1]} \$* }"

   done
 done
 unset '_LANGUAGES[en]'
 for l in ${(k)_LANGUAGES}; do
   done
 done
 unset '_LANGUAGES[en]'
 for l in ${(k)_LANGUAGES}; do

-  eval "${l}() { (_${l}-en \$*; _en-${l} \$*) | more }"
+  eval "function ${l}() { (_${l}-en \$*; _en-${l} \$*) | more }"

 done
 unset _LANGUAGES
 
 done
 unset _LANGUAGES