Merge upstream changes to 'svn-vim'
commitb9bc470421b31ff15ebaa1a3ddd9df7923a1c847
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 23 Mar 2008 12:52:13 +0000 (23 13:52 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 23 Mar 2008 12:52:13 +0000 (23 13:52 +0100)
treeff63f064b0c8bb3070993d85a0a8f8b655c0b813
parentbca7fa2a491985c71f87413d477b868ca0a559a4
parentcae60f7c37a3a2ba143044cfdba24818e459f7dd
Merge upstream changes to 'svn-vim'

Conflicts:
runtime/doc/options.txt
src/vim.h
13 files changed:
runtime/doc/options.txt
src/Makefile
src/buffer.c
src/eval.c
src/ex_docmd.c
src/fileio.c
src/globals.h
src/main.c
src/option.c
src/os_unix.c
src/search.c
src/version.c
src/vim.h