Merged from the latest developing branch.
commitcce287e02577075d5883f7670fcd10cbdad55a47
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 12 Sep 2009 06:03:53 +0000 (12 06:03 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 12 Sep 2009 06:03:53 +0000 (12 06:03 +0000)
tree58703e2cec7fb833de1ef6b50767e96b51b15edb
parent2944a4df70fbddc982d7b9b36331275bd2c5a332
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1604 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/fileio.c
src/gui_gtk_f.c
src/gui_gtk_x11.c
src/option.c
src/testdir/Makefile
src/testdir/test67.in [new file with mode: 0644]
src/testdir/test67.ok [new file with mode: 0644]
src/ui.c
src/version.c