Merge branch 'vim'
commite7edef37f58321f5b58107dc009e00fa342575ea
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 21 Nov 2009 21:45:06 +0000 (21 22:45 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 21 Nov 2009 21:45:06 +0000 (21 22:45 +0100)
tree6e48095c6f36c696d8ebe606a2b66eccbd5ad955
parente21682882c10f2af36b36cc89f4818ee3b25f89e
parentab7bf4d78ed066084b7e9c9ad5c777aeb971378f
Merge branch 'vim'

Conflicts:
src/auto/configure
src/auto/configure
src/configure.in
src/edit.c
src/eval.c
src/fileio.c
src/if_python.c
src/main.c
src/misc1.c
src/screen.c
src/version.c