Merged from the latest developing branch.
commit73d7ffa2739410024db0a47b878c41026f496dd7
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 12 Nov 2008 07:59:24 +0000 (12 07:59 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 12 Nov 2008 07:59:24 +0000 (12 07:59 +0000)
tree48b9eff6d352cfcb6a27c4ea3f774deeaaf0e299
parentc0a1a77705a7f1eaa291c6f4d9470e9ed21ffd4a
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1235 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/fileio.c
src/testdir/test42.ok
src/version.c