Merged from the latest developing branch.
commit2735ea1048f1e0f2e490ac3eb09980d16270f6fa
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 29 Sep 2007 14:09:25 +0000 (29 14:09 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 29 Sep 2007 14:09:25 +0000 (29 14:09 +0000)
treef51e1c81f7ce3457571b249f0266047247da72c4
parenta17475d251d014029fb1110a1aab583946ad5db9
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@563 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/buffer.c
src/diff.c
src/ex_getln.c
src/fileio.c
src/globals.h
src/gui_mac.c
src/misc2.c
src/proto/fileio.pro
src/version.c
src/window.c