Merged from the latest developing branch.
commitf396c5923c71d7644785a44adbced3e3d3126a21
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sun, 13 Jan 2008 07:39:28 +0000 (13 07:39 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sun, 13 Jan 2008 07:39:28 +0000 (13 07:39 +0000)
treeea924f73bca6e021864074b16f8a326135e602bb
parenteb7c29f5f9b9f33d9b4137b81534bcca24d4ef59
Merged from the latest developing branch.

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