Merge branch 'master' of majnematic.com:davesdots

vimrc

@@ -109,7 +109,6 @@ endif
 set laststatus=2
 set shortmess=atI
 if has('statusline')
-   set statusline=Editing:\ %r%t%m\ %=Location:\ Line\ %l/%L\ \ Col:\ %c\ (%p%%)
    set statusline=%<%F\ %r[%{&ff}]%y%m\ %=\ Line\ %l\/%L\ Col:\ %c\ (%P)
 endif
 
@@ -145,7 +144,7 @@ if has('eval')
    elseif &t_Co == 88
       call LoadColorScheme("wombat:zellner")
    else
-      call LoadColorScheme("zellner")
+      call LoadColorScheme("darkblue:zellner")
    endif
 endif
 
@@ -242,13 +241,15 @@ endif
 
 " Append modeline after last line in buffer.
 " Use substitute() (not printf()) to handle '%%s' modeline in LaTeX files.
-function! AppendModeline()
-   let save_cursor = getpos('.')
-   let append = ' vim: set ts='.&tabstop.' sw='.&shiftwidth.' tw='.&textwidth.': '
-   $put =substitute(&commentstring, '%s', append, '')
-   call setpos('.', save_cursor)
-endfunction
-nnoremap <silent> <Leader>ml :call AppendModeline()<CR>
+if has('eval')
+   fun! AppendModeline()
+      let save_cursor = getpos('.')
+      let append = ' vim: set ts='.&tabstop.' sw='.&shiftwidth.' tw='.&textwidth.': '
+      $put =substitute(&commentstring, '%s', append, '')
+      call setpos('.', save_cursor)
+   endfun
+   nnoremap <silent> <Leader>ml :call AppendModeline()<CR>
+endif
 
 " tab indents selection
 vmap <silent> <Tab> >gv
@@ -283,14 +284,16 @@ endif
 nmap K K<cr>
 
 " stolen from auctex.vim
-function! EmacsKill()
-   if col(".") == strlen(getline(line(".")))+1
-      let @" = "\<CR>"
-      return "\<Del>"
-   else
-      return "\<C-O>D"
-   endif
-endfunction
+if has('eval')
+   fun! EmacsKill()
+      if col(".") == strlen(getline(line(".")))+1
+         let @" = "\<CR>"
+         return "\<Del>"
+      else
+         return "\<C-O>D"
+      endif
+   endfun
+endif
 
 " some emacs-isms are OK
 map! <C-a> <Home>
@@ -298,7 +301,9 @@ map <C-a> <Home>
 map! <C-e> <End>
 map <C-e> <End>
 map <C-k> d$
-inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR>
+if has('eval')
+   inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR>
+endif
 
 " Disable q and Q
 map q <Nop>

zsh/bindkey

@@ -30,6 +30,7 @@ case $TERM in
 		bindkey '\e[c' emacs-forward-word
 		bindkey '\e[d' emacs-backward-word
 		bindkey '\M-B\M-^H' backward-kill-word
+		bindkey '\M-^H' backward-kill-word
 		bindkey '\M-C\M-?' backward-kill-word
 	;;
 	mlterm|kterm)