Merged from the latest developing branch.
commit22d55e5ef356cead4c46328a574abc73b14dcee9
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 16 Aug 2007 02:14:16 +0000 (16 02:14 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 16 Aug 2007 02:14:16 +0000 (16 02:14 +0000)
treee1283038ac7e093fd9eb61ea895603c7157923b5
parentdefcaa7725790a06c2747e95357bc1582978a15c
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@458 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/charset.c
src/gui.c
src/macros.h
src/ui.c
src/version.c