Skip to content

Commit 864207d

Browse files
brammoolbrammool
committed
updated for version 7.2a
1 parent c1a11ed commit 864207d

17 files changed

Lines changed: 1286 additions & 92 deletions

File tree

‎runtime/doc/hebrew.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*hebrew.txt* For Vim version 7.1. Last change: 2003 May 11
1+
*hebrew.txt* For Vim version 7.2a. Last change: 2007 Jun 14
22

33

44
VIM REFERENCE MANUAL by Ron Aaron (and Avner Lottem)
@@ -7,11 +7,8 @@
77
Hebrew Language support (options & mapping) for Vim *hebrew*
88

99
The supporting 'rightleft' functionality was originally created by Avner
10-
Lottem:
11-
E-mail: [email protected]
12-
Phone: +972-4-8307322
13-
14-
Ron Aaron <[email protected]> is currently helping support these features.
10+
Lottem. <alottem at gmail dot com> Ron Aaron <ron at ronware dot org> is
11+
currently helping support these features.
1512

1613
{Vi does not have any of these commands}
1714

‎runtime/doc/repeat.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*repeat.txt* For Vim version 7.1. Last change: 2007 Jan 07
1+
*repeat.txt* For Vim version 7.2a. Last change: 2007 Aug 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -89,10 +89,11 @@ This replaces all occurrences of "pat" with "PAT". The same can be done with:
8989
:%s/pat/PAT/g
9090
Which is two characters shorter!
9191

92-
A special case is using ":visual" as a command. This will move to a matching
93-
line, go to Normal mode to let you execute commands there until you use |Q| to
94-
return to Ex mode. This will be repeated for each matching line. While doing
95-
this you cannot use ":global".
92+
When using "global" in Ex mode, a special case is using ":visual" as a
93+
command. This will move to a matching line, go to Normal mode to let you
94+
execute commands there until you use |Q| to return to Ex mode. This will be
95+
repeated for each matching line. While doing this you cannot use ":global".
96+
To abort this type CTRL-C twice.
9697

9798
==============================================================================
9899
3. Complex repeats *complex-repeat*

‎runtime/doc/starting.txt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*starting.txt* For Vim version 7.1. Last change: 2007 Aug 14
1+
*starting.txt* For Vim version 7.2a. Last change: 2008 Jun 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1386,10 +1386,14 @@ using this command: >
13861386
13871387
vim -c "normal '0"
13881388
1389-
In a shell you could make an alias for it: >
1389+
In a csh compatible shell you could make an alias for it: >
13901390
13911391
alias lvim vim -c '"'normal "'"0'"'
13921392
1393+
For a bash-like shell: >
1394+
1395+
alias lvim='vim -c "normal '\''0"'
1396+
13931397
Use the "r" flag in 'viminfo' to specify for which files no marks should be
13941398
remembered.
13951399

‎runtime/doc/usr_23.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_23.txt* For Vim version 7.1. Last change: 2006 Apr 24
1+
*usr_23.txt* For Vim version 7.2a. Last change: 2006 Apr 24
22

33
VIM USER MANUAL - by Bram Moolenaar
44

‎runtime/ftplugin/javascript.vim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim filetype plugin file
22
" Language: Javascript
33
" Maintainer: Doug Kearns <[email protected]>
4-
" Last Change: 2007 Feb 21
4+
" Last Change: 2008 Jun 15
55
" URL: http://gus.gscit.monash.edu.au/~djkea2/vim/ftplugin/javascript.vim
66

77
if exists("b:did_ftplugin")
@@ -28,7 +28,7 @@ setlocal commentstring=//%s
2828

2929
" Change the :browse e filter to primarily show Java-related files.
3030
if has("gui_win32")
31-
let b:browsefilter="Javascript Files (*.js)\t*.js\n"
31+
let b:browsefilter="Javascript Files (*.js)\t*.js\n" .
3232
\ "All Files (*.*)\t*.*\n"
3333
endif
3434

‎runtime/ftplugin/man.vim‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim filetype plugin file
22
" Language: man
33
" Maintainer: Nam SungHyun <[email protected]>
4-
" Last Change: 2006 Dec 04
4+
" Last Change: 2007 Nov 30
55

66
" To make the ":Man" command available before editing a manual page, source
77
" this script from your startup vimrc file.
@@ -41,13 +41,16 @@ if !exists("s:man_tag_depth")
4141

4242
let s:man_tag_depth = 0
4343

44-
if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5"
45-
let s:man_sect_arg = "-s"
46-
let s:man_find_arg = "-l"
47-
else
48-
let s:man_sect_arg = ""
49-
let s:man_find_arg = "-w"
50-
endif
44+
let s:man_sect_arg = ""
45+
let s:man_find_arg = "-w"
46+
try
47+
if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5"
48+
let s:man_sect_arg = "-s"
49+
let s:man_find_arg = "-l"
50+
endif
51+
catch /E145:/
52+
" Ignore the error in restricted mode
53+
endtry
5154

5255
func <SID>PreGetPage(cnt)
5356
if a:cnt == 0

‎runtime/macros/matchit.vim‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" matchit.vim: (global plugin) Extended "%" matching
2-
" Last Change: Mon May 15 10:00 PM 2006 EDT
2+
" Last Change: Fri Jan 25 10:00 AM 2008 EST
33
" Maintainer: Benji Fisher PhD <[email protected]>
4-
" Version: 1.11, for Vim 6.3+
4+
" Version: 1.13.2, for Vim 6.3+
55
" URL: http://www.vim.org/script.php?script_id=39
66

77
" Documentation:
@@ -42,7 +42,7 @@ if exists("loaded_matchit") || &cp
4242
endif
4343
let loaded_matchit = 1
4444
let s:last_mps = ""
45-
let s:last_words = ""
45+
let s:last_words = ":"
4646

4747
let s:save_cpo = &cpo
4848
set cpo&vim
@@ -100,22 +100,21 @@ function! s:Match_wrapper(word, forward, mode) range
100100
" In s:CleanUp(), we may need to check whether the cursor moved forward.
101101
let startline = line(".")
102102
let startcol = col(".")
103-
" Use default behavior if called with a count or if no patterns are defined.
103+
" Use default behavior if called with a count.
104104
if v:count
105105
exe "normal! " . v:count . "%"
106106
return s:CleanUp(restore_options, a:mode, startline, startcol)
107-
elseif !exists("b:match_words") || b:match_words == ""
108-
silent! normal! %
109-
return s:CleanUp(restore_options, a:mode, startline, startcol)
110107
end
111108

112109
" First step: if not already done, set the script variables
113110
" s:do_BR flag for whether there are backrefs
114111
" s:pat parsed version of b:match_words
115112
" s:all regexp based on s:pat and the default groups
116113
"
117-
" Allow b:match_words = "GetVimMatchWords()" .
118-
if b:match_words =~ ":"
114+
if !exists("b:match_words") || b:match_words == ""
115+
let match_words = ""
116+
" Allow b:match_words = "GetVimMatchWords()" .
117+
elseif b:match_words =~ ":"
119118
let match_words = b:match_words
120119
else
121120
execute "let match_words =" b:match_words
@@ -125,13 +124,6 @@ function! s:Match_wrapper(word, forward, mode) range
125124
\ exists("b:match_debug")
126125
let s:last_words = match_words
127126
let s:last_mps = &mps
128-
if match_words !~ s:notslash . '\\\d'
129-
let s:do_BR = 0
130-
let s:pat = match_words
131-
else
132-
let s:do_BR = 1
133-
let s:pat = s:ParseWords(match_words)
134-
endif
135127
" The next several lines were here before
136128
" BF started messing with this script.
137129
" quote the special chars in 'matchpairs', replace [,:] with \| and then
@@ -141,8 +133,15 @@ function! s:Match_wrapper(word, forward, mode) range
141133
let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
142134
\ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>'
143135
" s:all = pattern with all the keywords
144-
let s:all = s:pat . (strlen(s:pat) ? "," : "") . default
145-
let s:all = substitute(s:all, s:notslash . '\zs[,:]\+', '\\|', 'g')
136+
let match_words = match_words . (strlen(match_words) ? "," : "") . default
137+
if match_words !~ s:notslash . '\\\d'
138+
let s:do_BR = 0
139+
let s:pat = match_words
140+
else
141+
let s:do_BR = 1
142+
let s:pat = s:ParseWords(match_words)
143+
endif
144+
let s:all = substitute(s:pat, s:notslash . '\zs[,:]\+', '\\|', 'g')
146145
let s:all = '\%(' . s:all . '\)'
147146
" let s:all = '\%(' . substitute(s:all, '\\\ze[,:]', '', 'g') . '\)'
148147
if exists("b:match_debug")
@@ -172,16 +171,14 @@ function! s:Match_wrapper(word, forward, mode) range
172171
else " Find the match that ends on or after the cursor and set curcol.
173172
let regexp = s:Wholematch(matchline, s:all, startcol-1)
174173
let curcol = match(matchline, regexp)
174+
" If there is no match, give up.
175+
if curcol == -1
176+
return s:CleanUp(restore_options, a:mode, startline, startcol)
177+
endif
175178
let endcol = matchend(matchline, regexp)
176179
let suf = strlen(matchline) - endcol
177180
let prefix = (curcol ? '^.*\%' . (curcol + 1) . 'c\%(' : '^\%(')
178181
let suffix = (suf ? '\)\%' . (endcol + 1) . 'c.*$' : '\)$')
179-
" If the match comes from the defaults, bail out.
180-
if matchline !~ prefix .
181-
\ substitute(s:pat, s:notslash.'\zs[,:]\+', '\\|', 'g') . suffix
182-
silent! norm! %
183-
return s:CleanUp(restore_options, a:mode, startline, startcol)
184-
endif
185182
endif
186183
if exists("b:match_debug")
187184
let b:match_match = matchstr(matchline, regexp)
@@ -401,6 +398,7 @@ fun! s:ParseWords(groups)
401398
endwhile " Now, tail has been used up.
402399
let parsed = parsed . ","
403400
endwhile " groups =~ '[^,:]'
401+
let parsed = substitute(parsed, ',$', '', '')
404402
return parsed
405403
endfun
406404

@@ -651,7 +649,7 @@ fun! s:MultiMatch(spflag, mode)
651649
" s:all regexp based on s:pat and the default groups
652650
" This part is copied and slightly modified from s:Match_wrapper().
653651
let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
654-
\ '\/\*:\*\/,#if\%(def\)\=:$else\>:#elif\>:#endif\>'
652+
\ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>'
655653
" Allow b:match_words = "GetVimMatchWords()" .
656654
if b:match_words =~ ":"
657655
let match_words = b:match_words
@@ -682,10 +680,12 @@ fun! s:MultiMatch(spflag, mode)
682680
" - maybe even more functionality should be split off
683681
" - into separate functions!
684682
let cdefault = (s:pat =~ '[^,]$' ? "," : "") . default
685-
let open = substitute(s:pat . cdefault, ':[^,]*,', '\\),\\(', 'g')
686-
let open = '\(' . substitute(open, ':[^,]*$', '\\)', '')
687-
let close = substitute(s:pat . cdefault, ',[^,]*:', '\\),\\(', 'g')
688-
let close = substitute(close, '[^,]*:', '\\(', '') . '\)'
683+
let open = substitute(s:pat . cdefault,
684+
\ s:notslash . '\zs:.\{-}' . s:notslash . ',', '\\),\\(', 'g')
685+
let open = '\(' . substitute(open, s:notslash . '\zs:.*$', '\\)', '')
686+
let close = substitute(s:pat . cdefault,
687+
\ s:notslash . '\zs,.\{-}' . s:notslash . ':', '\\),\\(', 'g')
688+
let close = substitute(close, '^.\{-}' . s:notslash . ':', '\\(', '') . '\)'
689689
if exists("b:match_skip")
690690
let skip = b:match_skip
691691
elseif exists("b:match_comment") " backwards compatibility and testing!

‎runtime/plugin/rrhelper.vim‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" Vim plugin with helper function(s) for --remote-wait
22
" Maintainer: Flemming Madsen <[email protected]>
3-
" Last Change: 2004 May 30
3+
" Last Change: 2008 May 29
44

55
" Has this already been loaded?
66
if exists("loaded_rrhelper")
@@ -27,7 +27,12 @@ if has("clientserver")
2727

2828
" Path separators are always forward slashes for the autocommand pattern.
2929
" Escape special characters with a backslash.
30-
let f = escape(substitute(argv(cnt), '\\', '/', "g"), ' *,?[{')
30+
let f = substitute(argv(cnt), '\\', '/', "g")
31+
if exists('*fnameescape')
32+
let f = fnameescape(f)
33+
else
34+
let f = escape(f, " \t\n*?[{`$\\%#'\"|!<")
35+
endif
3136
execute "augroup ".uniqueGroup
3237
execute "autocmd ".uniqueGroup." BufUnload ". f ." call DoRemoteReply('".id."', '".cnt."', '".uniqueGroup."', '". f ."')"
3338
let cnt = cnt + 1

‎runtime/syntax/dosbatch.vim‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
" Language: MSDOS batch file (with NT command extensions)
33
" Maintainer: Mike Williams <[email protected]>
44
" Filenames: *.bat
5-
" Last Change: 16th March 2004
5+
" Last Change: 10th May 2008
66
" Web Page: http://www.eandem.co.uk/mrw/vim
77
"
88
" Options Flags:
@@ -43,8 +43,8 @@ syn match dosbatchOperator "\s\(&\||\|^\|<<\|>>\)=\=\s"
4343
syn match dosbatchIfOperator "if\s\+\(\(not\)\=\s\+\)\=\(exist\|defined\|errorlevel\|cmdextversion\)\="lc=2
4444

4545
" String - using "'s is a convenience rather than a requirement outside of FOR
46-
syn match dosbatchString "\"[^"]*\"" contains=dosbatchVariable,dosBatchArgument,@dosbatchNumber
47-
syn match dosbatchString "\<echo[^)>|]*"lc=4 contains=dosbatchVariable,dosbatchArgument,@dosbatchNumber
46+
syn match dosbatchString "\"[^"]*\"" contains=dosbatchVariable,dosBatchArgument,dosbatchSpecialChar,@dosbatchNumber,@Spell
47+
syn match dosbatchString "\<echo\([^)>|]\|\^\@<=[)>|]\)*"lc=4 contains=dosbatchVariable,dosbatchArgument,dosbatchSpecialChar,@dosbatchNumber,@Spell
4848
syn match dosbatchEchoOperator "\<echo\s\+\(on\|off\)\s*$"lc=4
4949

5050
" For embedded commands
@@ -91,12 +91,12 @@ syn match dosbatchLabel "\<goto\s\+\h\w*\>"lc=4
9191
syn match dosbatchLabel ":\h\w*\>"
9292

9393
" Comments - usual rem but also two colons as first non-space is an idiom
94-
syn match dosbatchComment "^rem\($\|\s.*$\)"lc=3 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument
95-
syn match dosbatchComment "\srem\($\|\s.*$\)"lc=4 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument
96-
syn match dosbatchComment "\s*:\s*:.*$" contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument
94+
syn match dosbatchComment "^rem\($\|\s.*$\)"lc=3 contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
95+
syn match dosbatchComment "\srem\($\|\s.*$\)"lc=4 contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
96+
syn match dosbatchComment "\s*:\s*:.*$" contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
9797

9898
" Comments in ()'s - still to handle spaces before rem
99-
syn match dosbatchComment "(rem[^)]*"lc=4 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument
99+
syn match dosbatchComment "(rem\([^)]\|\^\@<=)\)*"lc=4 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
100100

101101
syn keyword dosbatchImplicit append assoc at attrib break cacls cd chcp chdir
102102
syn keyword dosbatchImplicit chkdsk chkntfs cls cmd color comp compact convert copy
@@ -127,12 +127,12 @@ if version >= 508 || !exists("did_dosbatch_syntax_inits")
127127
HiLink dosbatchConditional Conditional
128128
HiLink dosbatchRepeat Repeat
129129

130-
HiLink dosbatchOperator Operator
131-
HiLink dosbatchEchoOperator dosbatchOperator
132-
HiLink dosbatchIfOperator dosbatchOperator
130+
HiLink dosbatchOperator Operator
131+
HiLink dosbatchEchoOperator dosbatchOperator
132+
HiLink dosbatchIfOperator dosbatchOperator
133133

134134
HiLink dosbatchArgument Identifier
135-
HiLink dosbatchIdentifier Identifier
135+
HiLink dosbatchIdentifier Identifier
136136
HiLink dosbatchVariable dosbatchIdentifier
137137

138138
HiLink dosbatchSpecialChar SpecialChar

‎runtime/syntax/gitconfig.vim‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
" Vim syntax file
2+
" Language: git config file
3+
" Maintainer: Tim Pope <[email protected]>
4+
" Filenames: gitconfig, .gitconfig, *.git/config
5+
" Last Change: 2008 Jun 04
6+
7+
if exists("b:current_syntax")
8+
finish
9+
endif
10+
11+
setlocal iskeyword+=-
12+
setlocal iskeyword-=_
13+
syn case ignore
14+
syn sync minlines=10
15+
16+
syn match gitconfigComment "[#;].*"
17+
syn match gitconfigSection "\%(^\s*\)\@<=\[[a-z0-9.-]\+\]"
18+
syn match gitconfigSection '\%(^\s*\)\@<=\[[a-z0-9.-]\+ \+\"\%([^\\"]\|\\.\)*"\]'
19+
syn match gitconfigVariable "\%(^\s*\)\@<=\a\k*\%(\s*\%([=#;]\|$\)\)\@=" nextgroup=gitconfigAssignment skipwhite
20+
syn region gitconfigAssignment matchgroup=gitconfigNone start=+=\s*+ skip=+\\+ end=+\s*$+ contained contains=gitconfigBoolean,gitconfigNumber,gitConfigString,gitConfigEscape,gitConfigError,gitconfigComment keepend
21+
syn keyword gitconfigBoolean true false yes no contained
22+
syn match gitconfigNumber "\d\+" contained
23+
syn region gitconfigString matchgroup=gitconfigDelim start=+"+ skip=+\\+ end=+"+ matchgroup=gitconfigError end=+[^\\"]\%#\@!$+ contained contains=gitconfigEscape,gitconfigEscapeError
24+
syn match gitconfigError +\\.+ contained
25+
syn match gitconfigEscape +\\[\\"ntb]+ contained
26+
syn match gitconfigEscape +\\$+ contained
27+
28+
hi def link gitconfigComment Comment
29+
hi def link gitconfigSection Keyword
30+
hi def link gitconfigVariable Identifier
31+
hi def link gitconfigBoolean Boolean
32+
hi def link gitconfigNumber Number
33+
hi def link gitconfigString String
34+
hi def link gitconfigDelim Delimiter
35+
hi def link gitconfigEscape Delimiter
36+
hi def link gitconfigError Error
37+
38+
let b:current_syntax = "gitconfig"

0 commit comments

Comments
 (0)