Merged from the latest developing branch.
commit2fc90f636246969d35ff1cdb2e186a6f2defcb55
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 25 Mar 2009 07:33:52 +0000 (25 07:33 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 25 Mar 2009 07:33:52 +0000 (25 07:33 +0000)
tree12a0f4a470e528b58c71a9c40c76a2bef67ad427
parentc3412be9776114118eb0a03468fc79760a988efc
Merged from the latest developing branch.

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