Merged from the latest developing branch.
commit253bd6ae5a27871fde6bc3a57c7cc58a8003a7ca
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 14 Feb 2008 01:19:52 +0000 (14 01:19 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 14 Feb 2008 01:19:52 +0000 (14 01:19 +0000)
treeeb92edee6de9494a464d66f161aba025d744a6b2
parented6c2a64b43dcce145fe474a580a2d7848dce296
Merged from the latest developing branch.

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