Merge branch 'vim'
commitd35e21c9ce1ee187e717c669904e83554aa70034
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 26 Apr 2009 12:33:05 +0000 (26 14:33 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 26 Apr 2009 12:33:05 +0000 (26 14:33 +0200)
treea824bf4e8533206d48346e78fd70fd0e632bf999
parentdb01359d6f3e577804e33586988955ad69b53a0d
parentfebe068efd74a6f641a8932e23b27dff8a1c32b7
Merge branch 'vim'

Conflicts:
src/eval.c
runtime/doc/options.txt
runtime/doc/tags
src/configure.in
src/eval.c
src/ex_docmd.c
src/ex_getln.c
src/search.c
src/version.c