Merged from the latest developing branch.
commitb9474fc01dfbc60f0f28867b105e1916739cb765
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 8 Nov 2007 12:40:47 +0000 (8 12:40 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 8 Nov 2007 12:40:47 +0000 (8 12:40 +0000)
treef25ffccfdbf632c7b76f714f2228afe3013e2ce5
parentb2b6bde035ca99671efea767716dbd57796e7453
Merged from the latest developing branch.

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