Merge commit 'svn-vim' into vim and update runtime files
commit335fee4a53fe2cef14dbd598771acddd8d6b923a
authorBjorn Winckler <bjorn.winckler@gmail.com>
Tue, 1 Jul 2008 16:23:42 +0000 (1 18:23 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Tue, 1 Jul 2008 16:23:42 +0000 (1 18:23 +0200)
treee65883fd49d81932ff1df979901f1a4923260fdd
parent1ebd024f0a16402cae3b8ca084e73db3ff3ac16e
parentba0b05f4e46828910b59322d750b7204f7d9a2d4
Merge commit 'svn-vim' into vim and update runtime files

Lots of conflicts in the runtime folder.  Instead of trying to resolve
the conflicts the latest runtime were rsync'ed from ftp.nluug.nl.
43 files changed:
runtime/autoload/rubycomplete.vim
runtime/compiler/eruby.vim
runtime/compiler/rspec.vim
runtime/doc/autocmd.txt
runtime/doc/eval.txt
runtime/doc/filetype.txt
runtime/doc/gui_w32.txt
runtime/doc/if_mzsch.txt
runtime/doc/if_tcl.txt
runtime/doc/indent.txt
runtime/doc/intro.txt
runtime/doc/netbeans.txt
runtime/doc/os_risc.txt
runtime/doc/pi_vimball.txt
runtime/doc/pi_zip.txt
runtime/doc/tags
runtime/doc/todo.txt
runtime/doc/usr_29.txt
runtime/doc/various.txt
runtime/doc/version5.txt
runtime/doc/version6.txt
runtime/doc/version7.txt
runtime/doc/vi_diff.txt
runtime/filetype.vim
runtime/ftplugin/eruby.vim
runtime/ftplugin/git.vim
runtime/getdos.aap
runtime/getunix.aap
runtime/indent/eruby.vim
runtime/indent/php.vim
runtime/indent/ruby.vim
runtime/keymap/bulgarian-bds.vim
runtime/keymap/bulgarian-phonetic.vim
runtime/macros/justify.vim
runtime/syntax/eruby.vim
runtime/syntax/haste.vim
runtime/syntax/hastepreproc.vim
runtime/syntax/messages.vim
runtime/syntax/muttrc.vim
runtime/syntax/ruby.vim
runtime/tutor/tutor.pl
runtime/tutor/tutor.pl.cp1250
runtime/tutor/tutor.pl.utf-8