Merge upstreams changes to vim source and runtime files
commit843c7437a0846b540778fd036b99ffa1f4cea298
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 8 Mar 2008 18:36:11 +0000 (8 19:36 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 8 Mar 2008 18:36:11 +0000 (8 19:36 +0100)
treec43730d7bd035d8632d82ae46605e49cbec117c9
parent0a480bc862c9c54cf14e36c692bd5a1f01931fb6
parent56d2a8e2304b5d68819d672324e2f9cc2f12f2e0
Merge upstreams changes to vim source and runtime files

Conflicts:
runtime/doc/eval.txt
runtime/doc/index.txt
runtime/doc/options.txt
runtime/doc/quickref.txt
runtime/doc/syntax.txt
runtime/doc/tags
runtime/syntax/vim.vim
runtime/doc/eval.txt
runtime/doc/gui_x11.txt
runtime/doc/index.txt
runtime/doc/options.txt
runtime/doc/quickref.txt
runtime/doc/syntax.txt
runtime/doc/tags
runtime/doc/various.txt
runtime/optwin.vim
runtime/syntax/vim.vim
src/version.c