Merged from the latest developing branch.
commit69fc1b2a75f4de8908f928b29af5e25a0f71ea56
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 4 Oct 2008 06:03:09 +0000 (4 06:03 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 4 Oct 2008 06:03:09 +0000 (4 06:03 +0000)
tree3d80d0d9d1a92ef9d06ec3efcd99bbe5563cf59e
parent6d857d46be5222623bf3857b7fa112875692731e
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1215 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/normal.c
src/option.c
src/screen.c
src/version.c