Skip to content

Commit

Permalink
Sync with newest CVS repository.
Browse files Browse the repository at this point in the history
git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/vim7@16 2a77ed30-b011-0410-a7ad-c7884a0aa172
  • Loading branch information
edyfox committed May 1, 2006
1 parent 0c964f2 commit 47cd429
Show file tree
Hide file tree
Showing 282 changed files with 3,476 additions and 3,080 deletions.
8 changes: 4 additions & 4 deletions Contents
Expand Up @@ -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.0f. Also runs under UNIX, MSDOS and other systems.
vim70frt.tgz contains the documentation and syntax files.
vim70fbin.tgz contains the binaries.
vim70fsrc.tgz contains the sources.
Version 7.0g. Also runs under UNIX, MSDOS and other systems.
vim70grt.tgz contains the documentation and syntax files.
vim70gbin.tgz contains the binaries.
vim70gsrc.tgz contains the sources.
Author: Bram Moolenaar et al.


Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -69,7 +69,7 @@ all install uninstall tools config configure proto depend lint tags types test t
# Before creating an archive first delete all backup files, *.orig, etc.

MAJOR = 7
MINOR = 0f
MINOR = 0g

# Uncomment this line if the Win32s version is to be included.
DOSBIN_S = dosbin_s
Expand Down
2 changes: 1 addition & 1 deletion README.txt
@@ -1,4 +1,4 @@
README.txt for version 7.0f of Vim: Vi IMproved.
README.txt for version 7.0g of Vim: Vi IMproved.


WHAT IS VIM
Expand Down
2 changes: 1 addition & 1 deletion README_ami.txt
@@ -1,4 +1,4 @@
README_ami.txt for version 7.0f of Vim: Vi IMproved.
README_ami.txt for version 7.0g of Vim: Vi IMproved.

This file explains the installation of Vim on Amiga systems.
See README.txt for general information about Vim.
Expand Down
2 changes: 1 addition & 1 deletion README_amibin.txt
@@ -1,4 +1,4 @@
README_amibin.txt for version 7.0f of Vim: Vi IMproved.
README_amibin.txt for version 7.0g of Vim: Vi IMproved.

See "README.txt" for general information about Vim.
See "README_ami.txt" for installation instructions for the Amiga.
Expand Down
2 changes: 1 addition & 1 deletion README_amisrc.txt
@@ -1,4 +1,4 @@
README_amisrc.txt for version 7.0f of Vim: Vi IMproved.
README_amisrc.txt for version 7.0g of Vim: Vi IMproved.

See "README.txt" for general information about Vim.
See "README_ami.txt" for installation instructions for the Amiga.
Expand Down
2 changes: 1 addition & 1 deletion README_bindos.txt
@@ -1,4 +1,4 @@
README_bindos.txt for version 7.0f of Vim: Vi IMproved.
README_bindos.txt for version 7.0g 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.
Expand Down
2 changes: 1 addition & 1 deletion README_dos.txt
@@ -1,4 +1,4 @@
README_dos.txt for version 7.0f of Vim: Vi IMproved.
README_dos.txt for version 7.0g 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.
Expand Down
2 changes: 1 addition & 1 deletion README_extra.txt
@@ -1,4 +1,4 @@
README_extra.txt for version 7.0f of Vim: Vi IMproved.
README_extra.txt for version 7.0g of Vim: Vi IMproved.

The extra archive of Vim is to be used in combination with the source archive
(vim-6.0-src.tar.gz). The extra archive is useless without it.
Expand Down
2 changes: 1 addition & 1 deletion README_lang.txt
@@ -1,4 +1,4 @@
README_lang.txt for version 7.0f of Vim: Vi IMproved.
README_lang.txt for version 7.0g of Vim: Vi IMproved.

This file contains files for non-English languages:
- Translated messages.
Expand Down
2 changes: 1 addition & 1 deletion README_mac.txt
@@ -1,4 +1,4 @@
README_mac.txt for version 7.0f of Vim: Vi IMproved.
README_mac.txt for version 7.0g of Vim: Vi IMproved.

This file explains the installation of Vim on Macintosh systems.
See "README.txt" for general information about Vim.
Expand Down
2 changes: 1 addition & 1 deletion README_ole.txt
@@ -1,4 +1,4 @@
README_ole.txt for version 7.0f of Vim: Vi IMproved.
README_ole.txt for version 7.0g 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
Expand Down
2 changes: 1 addition & 1 deletion README_os2.txt
@@ -1,4 +1,4 @@
README_os2.txt for version 7.0f of Vim: Vi IMproved.
README_os2.txt for version 7.0g of Vim: Vi IMproved.

This file explains the installation of Vim on OS/2 systems.
See "README.txt" for general information about Vim.
Expand Down
2 changes: 1 addition & 1 deletion README_os390.txt
@@ -1,4 +1,4 @@
README_os_390.txt for version 7.0f of Vim: Vi IMproved.
README_os_390.txt for version 7.0g of Vim: Vi IMproved.

Welcome to the OS/390 Unix port of VIM.

Expand Down
2 changes: 1 addition & 1 deletion README_src.txt
@@ -1,4 +1,4 @@
README_src.txt for version 7.0f of Vim: Vi IMproved.
README_src.txt for version 7.0g 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
Expand Down
2 changes: 1 addition & 1 deletion README_srcdos.txt
@@ -1,4 +1,4 @@
README_srcdos.txt for version 7.0f of Vim: Vi IMproved.
README_srcdos.txt for version 7.0g 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.
Expand Down
2 changes: 1 addition & 1 deletion README_unix.txt
@@ -1,4 +1,4 @@
README_unix.txt for version 7.0f of Vim: Vi IMproved.
README_unix.txt for version 7.0g of Vim: Vi IMproved.

This file explains the installation of Vim on Unix systems.
See "README.txt" for general information about Vim.
Expand Down
18 changes: 9 additions & 9 deletions README_vms.txt
@@ -1,4 +1,4 @@
README_vms.txt for version 7.0f of Vim: Vi IMproved.
README_vms.txt for version 7.0g 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.
Expand All @@ -22,8 +22,8 @@ To use the binary version, you need one of these archives:
vim-XX-exe-ia64-gui.zip IA64 GUI/Motif executables
vim-XX-exe-ia64-gtk.zip IA64 GUI/GTK executables
vim-XX-exe-ia64-term.zip IA64 console executables
vim-XX-exe-axp-gui.zip Alpha GUI/Motif executables
vim-XX-exe-axp-gtk.zip Alpha GUI/GTK executables
vim-XX-exe-axp-gui.zip Alpha GUI/Motif executables
vim-XX-exe-axp-gtk.zip Alpha GUI/GTK executables
vim-XX-exe-axp-term.zip Alpha console executables
vim-XX-exe-vax-gui.zip VAX GUI executables
vim-XX-exe-vax-term.zip VAX console executables
Expand All @@ -34,12 +34,12 @@ and of course
The binary archives contain: vim.exe, ctags.exe, xxd.exe files,
but there are also prepared "deploy ready" archives:

vim-XX-ia64.zip GUI and console executables with runtime and
help files for IA64 systems
vim-XX-axp.zip GUI and console executables with runtime and
help files for Alpha systems
vim-XX-vax.zip GUI and console executables with runtime and
help files for VAX systems
vim-XX-ia64.zip GUI and console executables with runtime and
help files for IA64 systems
vim-XX-axp.zip GUI and console executables with runtime and
help files for Alpha systems
vim-XX-vax.zip GUI and console executables with runtime and
help files for VAX systems

GTK builds need LIBGTK library installed.

Expand Down
2 changes: 1 addition & 1 deletion README_w32s.txt
@@ -1,4 +1,4 @@
README_w32s.txt for version 7.0f of Vim: Vi IMproved.
README_w32s.txt for version 7.0g 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.
Expand Down
2 changes: 1 addition & 1 deletion nsis/gvim.nsi
Expand Up @@ -22,7 +22,7 @@
!define HAVE_NLS

!define VER_MAJOR 7
!define VER_MINOR 0f
!define VER_MINOR 0g

# ----------- No configurable settings below this line -----------

Expand Down
8 changes: 4 additions & 4 deletions runtime/autoload/csscomplete.vim
@@ -1,7 +1,7 @@
" Vim completion script
" Language: CSS 2.1
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
" Last Change: 2005 Oct 12
" Last Change: 2006 Apr 30

function! csscomplete#CompleteCSS(findstart, base)
if a:findstart
Expand All @@ -19,12 +19,12 @@ else
" ^ ; : { } /* */
" Where ^ is start of line and /* */ are comment borders
" Depending on their relative position to cursor we will now what should
" be completed.
" be completed.
" 1. if nearest are ^ or { or ; current word is property
" 2. if : it is value (with exception of pseudo things)
" 3. if } we are outside of css definitions
" 4. for comments ignoring is be the easiest but assume they are the same
" as 1.
" as 1.
" 5. if @ complete at-rule
" 6. if ! complete important
if exists("b:compl_context")
Expand Down Expand Up @@ -385,7 +385,7 @@ else
let filestart = matchstr(entered_atruleafter, "^url([\"']\\?\\zs.*")
let files = split(glob(filestart.'*'), '\n')
let values = map(copy(files), '"url(".v:val')

else
let values = ['"', 'url(']

Expand Down
18 changes: 9 additions & 9 deletions runtime/autoload/htmlcomplete.vim
@@ -1,7 +1,7 @@
" Vim completion script
" Language: HTML and XHTML
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
" Last Change: 2006 Apr 24
" Last Change: 2006 Apr 30

function! htmlcomplete#CompleteTags(findstart, base)
if a:findstart
Expand All @@ -23,7 +23,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
" Handling of <style> tag {{{
let stylestart = searchpair('<style\>', '', '<\/style\>', "bnW")
let styleend = searchpair('<style\>', '', '<\/style\>', "nW")
if stylestart != 0 && styleend != 0
if stylestart != 0 && styleend != 0
if stylestart <= curline && styleend >= curline
let start = col('.') - 1
let b:csscompl = 1
Expand All @@ -36,7 +36,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
" Handling of <script> tag {{{
let scriptstart = searchpair('<script\>', '', '<\/script\>', "bnW")
let scriptend = searchpair('<script\>', '', '<\/script\>', "nW")
if scriptstart != 0 && scriptend != 0
if scriptstart != 0 && scriptend != 0
if scriptstart <= curline && scriptend >= curline
let start = col('.') - 1
let b:jscompl = 1
Expand Down Expand Up @@ -109,7 +109,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
endwhile
endif
" If b:compl_context begins with <? we are inside of PHP code. It
" wasn't closed so PHP completion passed it to HTML
" wasn't closed so PHP completion passed it to HTML
if &filetype =~? 'php' && b:compl_context =~ '^<?'
let b:phpcompl = 1
let start = col('.') - 1
Expand Down Expand Up @@ -200,7 +200,7 @@ function! htmlcomplete#CompleteTags(findstart, base)

" If context contains > it means we are already outside of tag and we
" should abandon action
" If context contains white space it is attribute.
" If context contains white space it is attribute.
" It can be also value of attribute.
" We have to get first word to offer proper completions
if context == ''
Expand Down Expand Up @@ -353,7 +353,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
let filelines = getline(1, line('$'))
" 2. Find lines with possible id
let used_id_lines = filter(filelines, 'v:val =~ "id\\s*=\\s*[\"''][a-zA-Z0-9_-]\\+"')
" 3a. Join all filtered lines
" 3a. Join all filtered lines
let id_string = join(used_id_lines, ' ')
" 3b. And split them to be sure each id is in separate item
let id_list = split(id_string, 'id\s*=\s*')
Expand Down Expand Up @@ -432,7 +432,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
return javascriptcomplete#CompleteJS(0, js_context)

endif

" }}}
let stripbase = matchstr(context, ".*\\(on[a-zA-Z]*\\|style\\|class\\)\\s*=\\s*[\"']\\zs.*")
" Now we have context stripped from all chars up to style/class.
Expand Down Expand Up @@ -508,7 +508,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
call htmlcomplete#LoadData()
endif
" }}}

if has_key(b:html_omni, tag)
let attrs = keys(b:html_omni[tag][1])
else
Expand Down Expand Up @@ -600,7 +600,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
endif
endif
" }}}

if exists("uppercase_tag") && uppercase_tag == 1
let context = tolower(context)
endif
Expand Down
4 changes: 2 additions & 2 deletions runtime/autoload/javascriptcomplete.vim
@@ -1,7 +1,7 @@
" Vim completion script
" Language: Java Script
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
" Last Change: 2006 Feb 6
" Last Change: 2006 Apr 30

function! javascriptcomplete#CompleteJS(findstart, base)
if a:findstart
Expand Down Expand Up @@ -48,7 +48,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
let doms = ['style.']
" Arrays
let arrayprop = ['constructor', 'index', 'input', 'length', 'prototype']
let arraymeth = ['concat', 'join', 'pop', 'push', 'reverse', 'shift',
let arraymeth = ['concat', 'join', 'pop', 'push', 'reverse', 'shift',
\ 'splice', 'sort', 'toSource', 'toString', 'unshift', 'valueOf',
\ 'watch', 'unwatch']
call map(arraymeth, 'v:val."("')
Expand Down

0 comments on commit 47cd429

Please sign in to comment.