Merge branch 'vim' into master
commitdbab08c7bb5c1477f8fa7bca2fd0854a9dc8a224
authorBjorn Winckler <bjorn.winckler@gmail.com>
Tue, 1 Jul 2008 16:28:02 +0000 (1 18:28 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Tue, 1 Jul 2008 16:28:02 +0000 (1 18:28 +0200)
tree9a58c7f83555848b904cfd9964018e2205487172
parentc80d8bf0daa877544f23da63df0c9c754d3f70d8
parent335fee4a53fe2cef14dbd598771acddd8d6b923a
Merge branch 'vim' into master

Conflicts:

runtime/doc/help.txt
runtime/doc/index.txt
runtime/doc/os_mac.txt
runtime/doc/starting.txt
runtime/doc/version7.txt
38 files changed:
runtime/doc/eval.txt
runtime/doc/gui.txt
runtime/doc/gui_x11.txt
runtime/doc/help.txt
runtime/doc/index.txt
runtime/doc/options.txt
runtime/doc/os_mac.txt
runtime/doc/quickref.txt
runtime/doc/remote.txt
runtime/doc/starting.txt
runtime/doc/syntax.txt
runtime/doc/tags
runtime/doc/various.txt
runtime/doc/version7.txt
src/Makefile
src/buffer.c
src/configure.in
src/eval.c
src/ex_cmds.h
src/ex_docmd.c
src/ex_getln.c
src/feature.h
src/fileio.c
src/globals.h
src/gui.c
src/gui.h
src/main.c
src/menu.c
src/normal.c
src/option.c
src/option.h
src/os_unix.c
src/search.c
src/structs.h
src/syntax.c
src/ui.c
src/version.c
src/vim.h