Merged from the latest developing branch.
commit4f92679803e88231189bd1a1f45d99a06a2dac33
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 17 Jun 2009 03:06:57 +0000 (17 03:06 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 17 Jun 2009 03:06:57 +0000 (17 03:06 +0000)
treecd3cef9c43c46b25ee1c2742c006efdb15a9a427
parent07e11e40e8e34ec020dc94502c121293981757ef
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1528 2a77ed30-b011-0410-a7ad-c7884a0aa172
22 files changed:
runtime/doc/options.txt
src/Make_mvc.mak
src/fileio.c
src/globals.h
src/gui.c
src/gui_gtk_x11.c
src/gvim.exe.mnf
src/if_perl.xs
src/mbyte.c
src/netbeans.c
src/option.c
src/os_unix.c
src/proto/gui.pro
src/proto/mbyte.pro
src/proto/window.pro
src/screen.c
src/structs.h
src/term.c
src/version.c
src/vim.h
src/window.c
src/xxd/xxd.c