diff --git a/vimrc b/vimrc index 5a37021..0eb2d6f 100644 --- a/vimrc +++ b/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 ml :call AppendModeline() +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 ml :call AppendModeline() +endif " tab indents selection vmap >gv @@ -283,14 +284,16 @@ endif nmap K K " stolen from auctex.vim -function! EmacsKill() - if col(".") == strlen(getline(line(".")))+1 - let @" = "\" - return "\" - else - return "\D" - endif -endfunction +if has('eval') + fun! EmacsKill() + if col(".") == strlen(getline(line(".")))+1 + let @" = "\" + return "\" + else + return "\D" + endif + endfun +endif " some emacs-isms are OK map! @@ -298,7 +301,9 @@ map map! map map d$ -inoremap =EmacsKill() +if has('eval') + inoremap =EmacsKill() +endif " Disable q and Q map q diff --git a/zsh/bindkey b/zsh/bindkey index 4aea150..add3cd6 100755 --- a/zsh/bindkey +++ b/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)