Merge branch 'vim'
commit82fb5a84108a2de032dc9b2daaa72514e9c28604
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 19 Dec 2009 20:49:27 +0000 (19 21:49 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 19 Dec 2009 20:49:27 +0000 (19 21:49 +0100)
treef37cccff8482ba5b5ce4e2fc319683e8b28799f3
parent22915211b293a976c807f3509389d27025c1c291
parentfb44c1b1c90225a935b7ac3a27917d94ceba43dd
Merge branch 'vim'

Conflicts:
src/auto/configure
18 files changed:
runtime/doc/change.txt
runtime/doc/eval.txt
runtime/doc/options.txt
runtime/doc/starting.txt
runtime/doc/syntax.txt
runtime/doc/tags
runtime/doc/various.txt
runtime/doc/version7.txt
src/auto/configure
src/configure.in
src/ex_getln.c
src/fileio.c
src/main.c
src/mbyte.c
src/misc1.c
src/screen.c
src/syntax.c
src/version.c