Merge branch 'master' of majnematic.com:davesdots

commonsh/10_utility

@@ -90,42 +90,27 @@ extract ()
       *.tar)
          tar xf "${1}"
       ;;
-      *.gz|*.z)
-         gzip -dc "${1}" > `basename "${1%.*}"`
+      *.tar.bz2|*.tbz2|*.tbz)
+         bzip2 -dc "${1}" | tar xf -
       ;;
       *.tar.gz|*.tgz|*.tz)
          gzip -dc "${1}" | tar xf -
       ;;
-      *.Z)
-         uncompress -c "${1}" > `basename "${1%.*}"`
+      *.tar.lzma|*.tlz)
+         lzma -dc "${1}" | tar xf -
+      ;;
+      *.tar.xz|*.txz)
+         xz -dc "${1}" | tar xf -
       ;;
       *.tar.z|*.tar.Z|*.taz)
          uncompress -c "${1}" | tar xf -
       ;;
-      *.bz2|*.bz)
-         bzip2 -dc "${1}" > `basename "${1%.*}"`
-      ;;
-      *.tar.bz2|*.tbz2|*.tbz)
-         bzip2 -dc "${1}" | tar xf -
-      ;;
-      *.7z)
-         7zr x "${1}"
-      ;;
       *.tar.7z|*.t7z)
          7zr x -so "${1}" | tar xf -
       ;;
       *.lzma)
          lzma -dc "${1}" > `basename "${1%.*}"`
       ;;
-      *.tar.lzma|*.tlz)
-         lzma -dc "${1}" | tar xf -
-      ;;
-      *.xz)
-         xz -dc "${1}" > `basename "${1%.*}"`
-      ;;
-      *.tar.xz|*.txz)
-         xz -dc "${1}" | tar xf -
-      ;;
       *.a|*.deb)
          ar x "${1}"
       ;;
@@ -144,6 +129,12 @@ extract ()
       *.lha|*.lzh)
          lha xqf "${1}"
       ;;
+      *.pax)
+         pax -rf "${1}"
+      ;;
+      *.pax.bz2)
+         bzip2 -dc "${1}" | pax -rf -
+      ;;
       *.rar)
          unrar x -idq "${1}"
       ;;
@@ -156,6 +147,21 @@ extract ()
       *.zoo)
          zoo x "${1}"
       ;;
+      *.bz2|*.bz)
+         bzip2 -dc "${1}" > `basename "${1%.*}"`
+      ;;
+      *.gz|*.z)
+         gzip -dc "${1}" > `basename "${1%.*}"`
+      ;;
+      *.xz)
+         xz -dc "${1}" > `basename "${1%.*}"`
+      ;;
+      *.Z)
+         uncompress -c "${1}" > `basename "${1%.*}"`
+      ;;
+      *.7z)
+         7zr x "${1}"
+      ;;
       *)
          echo "Unable to extract '"$1"'"
          return 1

vimrc

@@ -109,7 +109,7 @@ endif
 set laststatus=2
 set shortmess=atI
 if has('statusline')
-   set statusline=%<%F\ %r[%{&ff}]%y%m\ %=\ Line\ %l\/%L\ Col:\ %c\ (%P)
+   set statusline=%<%F\ %r[%{&ff}]%y%m\ %=\ Line\ %l\/%L\ Col:\ %v\ (%P)
 endif
 
 " Enable modelines only on secure vim
@@ -297,10 +297,13 @@ endif
 
 " some emacs-isms are OK
 map! <C-a> <Home>
-map <C-a> <Home>
+map  <C-a> <Home>
 map! <C-e> <End>
-map <C-e> <End>
-map <C-k> d$
+map  <C-e> <End>
+imap <C-f> <Right>
+imap <C-b> <Left>
+map! <M-BS> <C-w>
+map  <C-k> d$
 if has('eval')
    inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR>
 endif
@@ -321,13 +324,13 @@ inoremap # X<BS>#
 " Both interix and cons use C-? as forward delete,
 " besides those two exceptions, always set it to backspace
 " Also let interix use ^[[U for end and ^[[H for home
-map <C-h> <BS>
+map  <C-h> <BS>
 map! <C-h> <BS>
 if (&term =~ "interix")
    map  <C-?> <DEL>
    map! <C-?> <DEL>
-   map  <Home>
-   map  <End>
+   map <C-[>[H <Home>
+   map <C-[>[U <End>
 elseif (&term =~ "^sun")
    map  <C-?> <DEL>
    map! <C-?> <DEL>
@@ -337,14 +340,14 @@ elseif (&term !~ "cons")
 endif
 
 if (&term =~ "^xterm")
-   map  <Home>
-   map!  <Home>
-   map  <End>
-   map!  <End>
-   map  <C-Left>
-   map!  <C-Left>
-   map  <C-Right>
-   map!  <C-Right>
+   map  <C-[>[H <Home>
+   map! <C-[>[H <Home>
+   map  <C-[>[F <End>
+   map! <C-[>[F <End>
+   map  <C-[>[5D <C-Left>
+   map! <C-[>[5D <C-Left>
+   map  <C-[>[5C <C-Right>
+   map! <C-[>[5C <C-Right>
 endif
 
 " Python specific stuff