Permalink
Browse files

Merge upstream

Conflicts:
	runtime/doc/eval.txt
	runtime/doc/os_mac.txt
	runtime/doc/various.txt
	runtime/syntax/vim.vim
  • Loading branch information...
2 parents 0136785 + dedeca9 commit abfce2ceb7067e37adb2b3ac5e2f2ebed1b1b311 @b4winckler committed Jul 5, 2008
Showing 516 changed files with 100,907 additions and 23,099 deletions.
View
@@ -9,10 +9,10 @@ Vim Vi IMproved. A clone of the UNIX text editor Vi. Very useful
messages, shows current file name in window title, on-line
help, rectangular cut/paste, etc., etc., etc...
- Version 7.1. Also runs under UNIX, MSDOS and other systems.
- vim71rt.tgz contains the documentation and syntax files.
- vim71bin.tgz contains the binaries.
- vim71src.tgz contains the sources.
+ Version 7.2a. Also runs under UNIX, MSDOS and other systems.
+ vim72art.tgz contains the documentation and syntax files.
+ vim72abin.tgz contains the binaries.
+ vim72asrc.tgz contains the sources.
Author: Bram Moolenaar et al.
View
@@ -137,6 +137,7 @@ SRC_UNIX = \
pixmaps/gen-inline-pixbufs.sh \
pixmaps/stock_icons.h \
src/INSTALL \
+ src/INSTALLx.txt \
src/Makefile \
src/auto/configure \
src/config.aap.in \
@@ -250,6 +251,7 @@ SRC_DOS = \
src/Make_w16.mak \
src/bigvim.bat \
src/msvcsetup.bat \
+ src/msvc2008.bat \
src/dimm.idl \
src/dlldata.c \
src/dosinst.c \
@@ -671,17 +673,9 @@ LANG_GEN = \
runtime/keymap/*.vim \
runtime/tutor/README.*.txt \
runtime/tutor/Makefile \
+ runtime/tutor/tutor.utf-8 \
runtime/tutor/tutor.?? \
- runtime/tutor/tutor.cs.* \
- runtime/tutor/tutor.gr.* \
- runtime/tutor/tutor.hu.* \
- runtime/tutor/tutor.ja.* \
- runtime/tutor/tutor.ko.* \
- runtime/tutor/tutor.pl.* \
- runtime/tutor/tutor.ru.* \
- runtime/tutor/tutor.sk.* \
- runtime/tutor/tutor.tr.* \
- runtime/tutor/tutor.zh.* \
+ runtime/tutor/tutor.??.* \
runtime/spell/README.txt \
runtime/spell/??/*.diff \
runtime/spell/??/main.aap \
View
@@ -69,7 +69,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
# Before creating an archive first delete all backup files, *.orig, etc.
MAJOR = 7
-MINOR = 1
+MINOR = 2a
# Uncomment this line if the Win32s version is to be included.
DOSBIN_S = dosbin_s
@@ -87,8 +87,8 @@ DOSBIN_S = dosbin_s
# ignore warnings for missing include files, fix problems for syntax errors).
# - With these features: "make depend" (works best with gcc).
# - "make lint" and check the output (ignore GTK warnings).
-# - Enable the efence library in "src/Makefile" and run "make test". May
-# require disabling Python and Ruby to avoid trouble with threads.
+# - Enable the efence library in "src/Makefile" and run "make test". Disable
+# Python and Ruby to avoid trouble with threads (efence is not threadsafe).
# - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
# - Check for missing options in runtime/optwin.vim et al. (with check.vim).
# - Do "make menu" to update the runtime/synmenu.vim file.
@@ -120,17 +120,20 @@ DOSBIN_S = dosbin_s
# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
# case set environment for compiling with Borland C++ 4.0 and do
# "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
+# NOTE: this currently fails because Vim is too big.
# - "make test" and check the output.
# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
# "uninstald16.exe".
# 32 bit DOS version:
# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
-# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output.
+# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
+# "ALL DONE".
# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
# "uninstald32.exe".
# Win32 console version:
-# - Set environment for Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
-# paths when necessary).
+# - Set environment for Visual C++ 2008 Express Edition: "msvc2008.bat". Or,
+# when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the paths
+# when necessary).
# - "nmake -f Make_mvc.mak"
# - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
# - Rename the executables to "vimw32.exe", "xxdw32.exe".
View
@@ -1,4 +1,4 @@
-README.txt for version 7.1 of Vim: Vi IMproved.
+README.txt for version 7.2a of Vim: Vi IMproved.
WHAT IS VIM
@@ -133,9 +133,6 @@ MAIN AUTHOR
Send any other comments, patches, pizza and suggestions to:
Bram Moolenaar E-mail: Bram@vim.org
- Molenstraat 2
- 2161 HP Lisse
- The Netherlands
-
-This is the address of my parents, they will forward mail and eat the pizza.
-My actual address will change a couple of times in 2006.
+ Finsterruetihof 1
+ 8134 Adliswil
+ Switzerland
View
@@ -1,4 +1,4 @@
-README_ami.txt for version 7.1 of Vim: Vi IMproved.
+README_ami.txt for version 7.2a of Vim: Vi IMproved.
This file explains the installation of Vim on Amiga systems.
See README.txt for general information about Vim.
View
@@ -1,4 +1,4 @@
-README_amibin.txt for version 7.1 of Vim: Vi IMproved.
+README_amibin.txt for version 7.2a of Vim: Vi IMproved.
See "README.txt" for general information about Vim.
See "README_ami.txt" for installation instructions for the Amiga.
View
@@ -1,4 +1,4 @@
-README_amisrc.txt for version 7.1 of Vim: Vi IMproved.
+README_amisrc.txt for version 7.2a of Vim: Vi IMproved.
See "README.txt" for general information about Vim.
See "README_ami.txt" for installation instructions for the Amiga.
View
@@ -1,4 +1,4 @@
-README_bindos.txt for version 7.1 of Vim: Vi IMproved.
+README_bindos.txt for version 7.2a of Vim: Vi IMproved.
See "README.txt" for general information about Vim.
See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
View
@@ -1,4 +1,4 @@
-README_dos.txt for version 7.1 of Vim: Vi IMproved.
+README_dos.txt for version 7.2a of Vim: Vi IMproved.
This file explains the installation of Vim on MS-DOS and MS-Windows systems.
See "README.txt" for general information about Vim.
View
@@ -1,4 +1,4 @@
-README_extra.txt for version 7.1 of Vim: Vi IMproved.
+README_extra.txt for version 7.2a of Vim: Vi IMproved.
The extra archive of Vim is to be used in combination with the source archive
(vim-7.0-src.tar.gz). The extra archive is useless without it.
View
@@ -1,4 +1,4 @@
-README_lang.txt for version 7.1 of Vim: Vi IMproved.
+README_lang.txt for version 7.2a of Vim: Vi IMproved.
This file contains files for non-English languages:
- Translated messages.
View
@@ -1,4 +1,4 @@
-README_mac.txt for version 7.1 of Vim: Vi IMproved.
+README_mac.txt for version 7.2a of Vim: Vi IMproved.
This file explains the installation of Vim on Macintosh systems.
See "README.txt" for general information about Vim.
View
@@ -1,4 +1,4 @@
-README_ole.txt for version 7.1 of Vim: Vi IMproved.
+README_ole.txt for version 7.2a of Vim: Vi IMproved.
This archive contains gvim.exe with OLE interface and VisVim.
This version of gvim.exe can also load a number of interface dynamically (you
View
@@ -1,4 +1,4 @@
-README_os2.txt for version 7.1 of Vim: Vi IMproved.
+README_os2.txt for version 7.2a of Vim: Vi IMproved.
This file explains the installation of Vim on OS/2 systems.
See "README.txt" for general information about Vim.
View
@@ -1,4 +1,4 @@
-README_os_390.txt for version 7.1 of Vim: Vi IMproved.
+README_os_390.txt for version 7.2a of Vim: Vi IMproved.
Welcome to the OS/390 Unix port of VIM.
View
@@ -1,4 +1,4 @@
-README_src.txt for version 7.1 of Vim: Vi IMproved.
+README_src.txt for version 7.2a of Vim: Vi IMproved.
The source archive contains the files needed to compile Vim on Unix systems.
It is packed for Unix systems (NL line separator). It is also used for other
View
@@ -1,4 +1,4 @@
-README_srcdos.txt for version 7.1 of Vim: Vi IMproved.
+README_srcdos.txt for version 7.2a of Vim: Vi IMproved.
See "README.txt" for general information about Vim.
See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
View
@@ -1,4 +1,4 @@
-README_unix.txt for version 7.1 of Vim: Vi IMproved.
+README_unix.txt for version 7.2a of Vim: Vi IMproved.
This file explains the installation of Vim on Unix systems.
See "README.txt" for general information about Vim.
View
@@ -1,4 +1,4 @@
-README_vms.txt for version 7.1 of Vim: Vi IMproved.
+README_vms.txt for version 7.2a of Vim: Vi IMproved.
This file explains the installation of Vim on VMS systems.
See "README.txt" in the runtime archive for information about Vim.
View
@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.1 of Vim: Vi IMproved.
+README_w32s.txt for version 7.2a of Vim: Vi IMproved.
This archive contains the gvim.exe that was specifically compiled for use in
the Win32s subsystem in MS-Windows 3.1 and 3.11.
View
@@ -22,7 +22,7 @@
!define HAVE_NLS
!define VER_MAJOR 7
-!define VER_MINOR 1
+!define VER_MINOR 2a
# ----------- No configurable settings below this line -----------
@@ -139,7 +139,7 @@ FunctionEnd
Function .onInstSuccess
WriteUninstaller vim${VER_MAJOR}${VER_MINOR}\uninstall-gui.exe
MessageBox MB_YESNO|MB_ICONQUESTION \
- "The installation process has been successfull. Happy Vimming! \
+ "The installation process has been successful. Happy Vimming! \
$\n$\n Do you want to see the README file now?" IDNO NoReadme
Exec '$0\gvim.exe -R "$0\README.txt"'
NoReadme:
@@ -1,7 +1,7 @@
" Vim completion script
" Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 May 08
+" Last Change: 2007 Aug 30
" This function is used for the 'omnifunc' option.
@@ -119,6 +119,27 @@ function! ccomplete#Complete(findstart, base)
" TODO: join previous line if it makes sense
let line = getline('.')
let col = col('.')
+ if stridx(strpart(line, 0, col), ';') != -1
+ " Handle multiple declarations on the same line.
+ let col2 = col - 1
+ while line[col2] != ';'
+ let col2 -= 1
+ endwhile
+ let line = strpart(line, col2 + 1)
+ let col -= col2
+ endif
+ if stridx(strpart(line, 0, col), ',') != -1
+ " Handle multiple declarations on the same line in a function
+ " declaration.
+ let col2 = col - 1
+ while line[col2] != ','
+ let col2 -= 1
+ endwhile
+ if strpart(line, col2 + 1, col - col2 - 1) =~ ' *[^ ][^ ]* *[^ ]'
+ let line = strpart(line, col2 + 1)
+ let col -= col2
+ endif
+ endif
if len(items) == 1
" Completing one word and it's a local variable: May add '[', '.' or
" '->'.
@@ -140,7 +161,7 @@ function! ccomplete#Complete(findstart, base)
let res = [{'match': match, 'tagline' : '', 'kind' : kind, 'info' : line}]
else
" Completing "var.", "var.something", etc.
- let res = s:Nextitem(strpart(line, 0, col), items[1:], 0, 1)
+ let res = s:Nextitem(strpart(line, 0, col), items[-1], 0, 1)
endif
endif
Oops, something went wrong.

0 comments on commit abfce2c

Please sign in to comment.