updated for version 7.0011
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 400eb76..0e68dfa 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0aa. Last change: 2004 Jul 18
+*eval.txt* For Vim version 7.0aa. Last change: 2004 Jul 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -831,6 +831,8 @@
exists( {expr}) Number TRUE if {expr} exists
expand( {expr}) String expand special keywords in {expr}
filereadable( {file}) Number TRUE if {file} is a readable file
+findfile( {name}[, {path}[, {count}]])
+ String Find fine {name} in {path}
filewritable( {file}) Number TRUE if {file} is a writable file
fnamemodify( {fname}, {mods}) String modify file name
foldclosed( {lnum}) Number first line of fold at {lnum} if closed
@@ -879,12 +881,12 @@
localtime() Number current time
maparg( {name}[, {mode}]) String rhs of mapping {name} in mode {mode}
mapcheck( {name}[, {mode}]) String check for mappings matching {name}
-match( {expr}, {pat}[, {start}])
+match( {expr}, {pat}[, {start}[, {count}]])
Number position where {pat} matches in {expr}
-matchend( {expr}, {pat}[, {start}])
+matchend( {expr}, {pat}[, {start}[, {count}]])
Number position where {pat} ends in {expr}
-matchstr( {expr}, {pat}[, {start}])
- String match of {pat} in {expr}
+matchstr( {expr}, {pat}[, {start}[, {count}]])
+ String {count}'th match of {pat} in {expr}
mode() String current editing mode
nextnonblank( {lnum}) Number line nr of non-blank line >= {lnum}
nr2char( {expr}) String single char with ASCII value {expr}
@@ -1412,6 +1414,23 @@
*file_readable()*
Obsolete name: file_readable().
+finddir({name}[, {path}[, {count}]]) *finddir()*
+ Find directory {name} in {path}.
+ If {path} is omitted or empty then 'path' is used.
+ If the optional {count} is given, find {count}'s occurrence of
+ {name} in {path}.
+ This is quite similar to the ex-command |:find|.
+ When the found directory is below the current directory a
+ relative path is returned. Otherwise a full path is returned.
+ Example: >
+ :echo findfile("tags.vim", ".;")
+< Searches from the current directory upwards until it finds
+ the file "tags.vim".
+ {only available when compiled with the +file_in_path feature}
+
+findfile({name}[, {path}[, {count}]]) *findfile()*
+ Just like |finddir()|, but find a file instead of a directory.
+
filewritable({file}) *filewritable()*
The result is a Number, which is 1 when a file with the
name {file} exists, and can be written. If {file} doesn't
@@ -2027,14 +2046,20 @@
< This avoids adding the "_vv" mapping when there already is a
mapping for "_v" or for "_vvv".
-match({expr}, {pat}[, {start}]) *match()*
+match({expr}, {pat}[, {start}[, {count}]]) *match()*
The result is a Number, which gives the index (byte offset) in
- {expr} where {pat} matches. A match at the first character
- returns zero. If there is no match -1 is returned. Example: >
+ {expr} where {pat} matches.
+ A match at the first character returns zero.
+ If there is no match -1 is returned.
+ Example: >
:echo match("testing", "ing")
< results in "4".
See |string-match| for how {pat} is used.
- If {start} is given, the search starts from index {start}.
+ When {count} is given use the {count}'th match. When a match
+ is found the search for the next one starts on character
+ further. Thus this example results in 1: >
+ echo match("testing", "..", 0, 2)
+< If {start} is given, the search starts from index {start}.
The result, however, is still the index counted from the
first character. Example: >
:echo match("testing", "ing", 2)
@@ -2050,7 +2075,7 @@
the pattern. 'smartcase' is NOT used. The matching is always
done like 'magic' is set and 'cpoptions' is empty.
-matchend({expr}, {pat}[, {start}]) *matchend()*
+matchend({expr}, {pat}[, {start}[, {count}]]) *matchend()*
Same as match(), but return the index of first character after
the match. Example: >
:echo matchend("testing", "ing")
@@ -2061,7 +2086,7 @@
:echo matchend("testing", "ing", 5)
< result is "-1".
-matchstr({expr}, {pat}[, {start}]) *matchstr()*
+matchstr({expr}, {pat}[, {start}[, {count}]]) *matchstr()*
Same as match(), but return the matched string. Example: >
:echo matchstr("testing", "ing")
< results in "ing".
diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt
index f242552..91eb641 100644
--- a/runtime/doc/os_mac.txt
+++ b/runtime/doc/os_mac.txt
@@ -1,4 +1,4 @@
-*os_mac.txt* For Vim version 7.0aa. Last change: 2004 Jun 19
+*os_mac.txt* For Vim version 7.0aa. Last change: 2004 Jul 19
VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -9,7 +9,7 @@
This file documents the particularities of the Macintosh version of Vim.
NOTE: This file is a bit outdated. You might find more useful info here:
- http://macvim.swdev.org/
+ http://macvim.org/
1. Filename Convention |mac-filename|
2. .vimrc an .vim files |mac-vimfile|
diff --git a/runtime/doc/tags b/runtime/doc/tags
index e44ac44..528b8a9 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4065,6 +4065,7 @@
builtin_terms term.txt /*builtin_terms*
byte-count editing.txt /*byte-count*
byte2line() eval.txt /*byte2line()*
+byteidx() eval.txt /*byteidx()*
bzip2 pi_gzip.txt /*bzip2*
c change.txt /*c*
c-syntax syntax.txt /*c-syntax*
@@ -4624,6 +4625,7 @@
filter change.txt /*filter*
find-manpage usr_12.txt /*find-manpage*
find-replace usr_10.txt /*find-replace*
+findfile() eval.txt /*findfile()*
fixed-5.1 version5.txt /*fixed-5.1*
fixed-5.2 version5.txt /*fixed-5.2*
fixed-5.3 version5.txt /*fixed-5.3*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index ba4af3e..9f3b615 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0aa. Last change: 2004 Jul 18
+*todo.txt* For Vim version 7.0aa. Last change: 2004 Jul 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -36,11 +36,6 @@
For version 7.0:
- Include many PATCHES:
8 Add functions:
- match({pat}, {string} [,start] [,count]) get index of count'th match
- Patch by Ilya Sher, 2004 Jun 19
- find() find file in 'path' (patch from Johannes
- Zellner 2001 Dec 20)
- Update 2004 Jun 16.
realname() Get user name (first, last, full)
user_fullname() patch by Nikolai Weibull, Nov
3 2002)
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index a7f7d19..006245f 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0aa. Last change: 2004 Jul 18
+*version7.txt* For Vim version 7.0aa. Last change: 2004 Jul 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -123,10 +123,13 @@
New functions: ~
+byteidx(expr, nr) |byteidx()| Index of a character. (Ilya Sher)
+finddir(name) |finddir()| Find a directory in 'path'.
+findfile(name) |findfile()| Find a file in 'path'. (Johannes
+ Zellner)
repeat(expr, count) |repeat()| Repeat "expr" "count" times.
(Christophe Poucet)
tr(expr, from, to) |tr()| Translate characters. (Ron Aaron)
-byteidx(expr, nr) |byteidx()| Index of a character. (Ilya Sher)
New autocommand events: ~
@@ -182,6 +185,8 @@
- #\(, #\), #\[ and #\] are recognized as character literals
- Lisp line comments (delimited by semicolon) are recognized
+Added the "count" argument to match(), matchend() and matchstr(). (Ilya Sher)
+
==============================================================================
COMPILE TIME CHANGES *compile-changes-7*
diff --git a/runtime/syntax/sql.vim b/runtime/syntax/sql.vim
index 9083b81..6d8bca3 100644
--- a/runtime/syntax/sql.vim
+++ b/runtime/syntax/sql.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: SQL, PL/SQL (Oracle 8i)
-" Maintainer: Paul Moore <gustav@morpheus.demon.co.uk>
-" Last Change: 2001 Apr 30
+" Maintainer: Paul Moore <pf_moore AT yahoo.co.uk>
+" Last Change: 2004 Jul 19
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
diff --git a/runtime/syntax/wsh.vim b/runtime/syntax/wsh.vim
index 98ba105..4b664a1 100644
--- a/runtime/syntax/wsh.vim
+++ b/runtime/syntax/wsh.vim
@@ -1,6 +1,6 @@
" Vim syntax file
" Language: Windows Scripting Host
-" Maintainer: Paul Moore <gustav@morpheus.demon.co.uk>
+" Maintainer: Paul Moore <pf_moore AT yahoo.co.uk>
" Last Change: Fre, 24 Nov 2000 21:54:09 +0100
" This reuses the XML, VB and JavaScript syntax files. While VB is not