Merged from the latest developing branch.
commit236dfa65e623c9d3808b9092ed6e1079fbeb1633
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 13 Mar 2008 04:07:38 +0000 (13 04:07 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Thu, 13 Mar 2008 04:07:38 +0000 (13 04:07 +0000)
treea94d428c4fb7d9c653ac044a02eb48e429acd4cd
parent21eb265ccf92726f47daefc1584104dba5c51201
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@961 2a77ed30-b011-0410-a7ad-c7884a0aa172
runtime/doc/options.txt
src/edit.c
src/gui_mac.c
src/ops.c
src/option.c
src/proto/ops.pro
src/version.c
src/vim.h