Merged from the latest developing branch.
commita0a782e4507c677448a6158bd25b5b152a075d19
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sun, 9 Mar 2008 13:39:59 +0000 (9 13:39 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sun, 9 Mar 2008 13:39:59 +0000 (9 13:39 +0000)
tree49539e93c961402d554a74d6bb2ef5100b8c5cf9
parent0a914119379a5d1e16039622122f9a874afdccfe
Merged from the latest developing branch.

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