Bjorn Winckler 14422b553e Merge branch 'vim73' into macvim73 ...

Conflicts:
	runtime/doc/options.txt
	runtime/doc/tags
	src/auto/configure
	src/configure.in
	src/eval.c
	src/main.c
	src/option.c
	src/os_mac.h
	src/os_macosx.c
	src/proto.h
	src/vim.h

2010-07-15 23:27:46 +02:00

..

autoload

When the buffer is in diff mode, have :TOhtml create HTML to show the diff

2010-07-11 22:38:52 +02:00

colors

Merge upstream

2010-02-24 17:23:00 +01:00

compiler

Crypt the text in the undo file if the file itself is crypted.

2010-05-30 22:48:02 +02:00

doc

Merge branch 'vim73' into macvim73

2010-07-15 23:27:46 +02:00

ftplugin

Update spell files for Ubuntu locale names.

2010-07-10 15:52:35 +02:00

icons

…

indent

Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)

2010-07-11 17:23:02 +02:00

keymap

Updated runtime files.

2010-05-14 23:24:24 +02:00

lang

Updated a few runtime files.

2010-05-18 22:28:22 +02:00

macros

Update runtime files.

2010-01-06 20:54:52 +01:00

plugin

When the buffer is in diff mode, have :TOhtml create HTML to show the diff

2010-07-11 22:38:52 +02:00

print

…

spell

Minor runtime file updates.

2010-07-12 23:05:41 +02:00

syntax

Merge branch 'vim73' into macvim73

2010-07-15 23:27:46 +02:00

tools

updated for version 7.2.348

2010-01-27 18:29:26 +01:00

tutor

Added salt to blowfish encryption.

2010-06-13 05:20:42 +02:00

bugreport.vim

…

delmenu.vim

…

doc.info

…

evim.vim

Found a way to make the MS-Windows installer wait for the uninstaller to

2010-05-25 21:02:00 +02:00

filetype.vim

Fix completion of file names with '%' and '*'.

2010-06-01 21:57:09 +02:00

ftoff.vim

…

ftplugin.vim

…

ftplugof.vim

…

gvimrc_example.vim

…

hi16-action-make.png

…

hi22-action-make.png

…

icons.info

…

indent.vim

…

indoff.vim

…

macmap.vim

…

macros.info

…

makemenu.vim

…

menu.vim

Merge branch 'vim73' into macvim73

2010-07-15 23:27:46 +02:00

mswin.vim

…

optwin.vim

Merge branch 'vim73' into macvim73

2010-07-05 22:11:19 +02:00

rgb.txt

…

scripts.vim

Update runtime files.

2010-01-06 20:54:52 +01:00

synmenu.vim

…

termcap

…

tools.info

…

tutor.info

…

vim16x16.gif

…

vim16x16.png

…

vim16x16.xpm

…

vim32x32.gif

…

vim32x32.png

…

vim32x32.xpm

…

vim48x48.gif

…

vim48x48.png

…

vim48x48.xpm

…

vimlogo.cdr

…

vimlogo.eps

…

vimlogo.gif

…

vimlogo.pdf

…

vimlogo.xpm

…

vimrc_example.vim

Update runtime files.

2010-01-06 20:54:52 +01:00