Merge commit 'svn-vim' into vim

Merge commit 'svn-vim' into vim

Conflicts:

	runtime/autoload/ada.vim
	runtime/autoload/adacomplete.vim
	runtime/autoload/decada.vim
	runtime/autoload/gnat.vim
	runtime/autoload/netrw.vim
	runtime/autoload/rubycomplete.vim
	runtime/autoload/vimball.vim
	runtime/compiler/decada.vim
	runtime/compiler/eruby.vim
	runtime/compiler/gnat.vim
	runtime/compiler/rspec.vim
	runtime/compiler/ruby.vim
	runtime/compiler/rubyunit.vim
	runtime/doc/change.txt
	runtime/doc/cmdline.txt
	runtime/doc/diff.txt
	runtime/doc/digraph.txt
	runtime/doc/eval.txt
	runtime/doc/filetype.txt
	runtime/doc/help.txt
	runtime/doc/options.txt
	runtime/doc/pattern.txt
	runtime/doc/syntax.txt
	runtime/doc/todo.txt
	runtime/doc/version7.txt
	runtime/filetype.vim
	runtime/ftplugin/ada.vim
	runtime/ftplugin/bst.vim
	runtime/ftplugin/cobol.vim
	runtime/ftplugin/eruby.vim
	runtime/ftplugin/ocaml.vim
	runtime/ftplugin/ruby.vim
	runtime/indent/ada.vim
	runtime/indent/bst.vim
	runtime/indent/cmake.vim
	runtime/indent/cobol.vim
	runtime/indent/eruby.vim
	runtime/indent/ruby.vim
	runtime/plugin/netrwPlugin.vim
	runtime/scripts.vim
	runtime/spell/pt/main.aap
	runtime/spell/pt/pt_BR.diff
	runtime/spell/pt/pt_PT.diff
	runtime/syntax/ada.vim
	runtime/syntax/aspvbs.vim
	runtime/syntax/bst.vim
	runtime/syntax/bzr.vim
	runtime/syntax/cmake.vim
	runtime/syntax/cobol.vim
	runtime/syntax/def.vim
	runtime/syntax/eruby.vim
	runtime/syntax/forth.vim
	runtime/syntax/initng.vim
	runtime/syntax/masm.vim
	runtime/syntax/rhelp.vim
	runtime/syntax/rnoweb.vim
	runtime/syntax/ruby.vim
	runtime/syntax/xdefaults.vim