Skip to content

Commit b2ebf7c

Browse files
committed
Updated runtime files.
1 parent c72a375 commit b2ebf7c

26 files changed

+842
-355
lines changed

runtime/autoload/netrw.vim

Lines changed: 455 additions & 221 deletions
Large diffs are not rendered by default.

runtime/autoload/vimball.vim

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" vimball.vim : construct a file containing both paths and files
22
" Author: Charles E. Campbell, Jr.
3-
" Date: Apr 02, 2011
4-
" Version: 33
3+
" Date: Sep 26, 2011
4+
" Version: 34
55
" GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
66
" Copyright: (c) 2004-2011 by Charles E. Campbell, Jr.
77
" The VIM LICENSE applies to Vimball.vim, and Vimball.txt
@@ -14,7 +14,7 @@
1414
if &cp || exists("g:loaded_vimball")
1515
finish
1616
endif
17-
let g:loaded_vimball = "v33"
17+
let g:loaded_vimball = "v34"
1818
if v:version < 702
1919
echohl WarningMsg
2020
echo "***warning*** this version of vimball needs vim 7.2"
@@ -220,7 +220,16 @@ fun! vimball#Vimball(really,...)
220220

221221
" go to vim plugin home
222222
if a:0 > 0
223+
" let user specify the directory where the vimball is to be unpacked.
224+
" If, however, the user did not specify a full path, set the home to be below the current directory
223225
let home= expand(a:1)
226+
if has("win32") || has("win95") || has("win64") || has("win16")
227+
if home !~ '^\a:[/\\]'
228+
let home= getcwd().'/'.a:1
229+
endif
230+
elseif home !~ '^/'
231+
let home= getcwd().'/'.a:1
232+
endif
224233
else
225234
let home= vimball#VimballHome()
226235
endif
@@ -282,11 +291,14 @@ fun! vimball#Vimball(really,...)
282291
" call Decho("making directories if they don't exist yet (fname<".fname.">)")
283292
let fnamebuf= substitute(fname,'\\','/','g')
284293
let dirpath = substitute(home,'\\','/','g')
294+
" call Decho("init: fnamebuf<".fnamebuf.">")
295+
" call Decho("init: dirpath <".dirpath.">")
285296
while fnamebuf =~ '/'
286297
let dirname = dirpath."/".substitute(fnamebuf,'/.*$','','')
287298
let dirpath = dirname
288299
let fnamebuf = substitute(fnamebuf,'^.\{-}/\(.*\)$','\1','')
289300
" call Decho("dirname<".dirname.">")
301+
" call Decho("dirpath<".dirpath.">")
290302
if !isdirectory(dirname)
291303
" call Decho("making <".dirname.">")
292304
if exists("g:vimball_mkdir")
@@ -569,9 +581,19 @@ endfun
569581
fun! s:ChgDir(newdir)
570582
" call Dfunc("ChgDir(newdir<".a:newdir.">)")
571583
if (has("win32") || has("win95") || has("win64") || has("win16"))
572-
exe 'silent cd '.fnameescape(substitute(a:newdir,'/','\\','g'))
584+
try
585+
exe 'silent cd '.fnameescape(substitute(a:newdir,'/','\\','g'))
586+
catch /^Vim\%((\a\+)\)\=:E/
587+
call mkdir(fnameescape(substitute(a:newdir,'/','\\','g')))
588+
exe 'silent cd '.fnameescape(substitute(a:newdir,'/','\\','g'))
589+
endtry
573590
else
574-
exe 'silent cd '.fnameescape(a:newdir)
591+
try
592+
exe 'silent cd '.fnameescape(a:newdir)
593+
catch /^Vim\%((\a\+)\)\=:E/
594+
call mkdir(fnameescape(a:newdir))
595+
exe 'silent cd '.fnameescape(a:newdir)
596+
endtry
575597
endif
576598
" call Dret("ChgDir : curdir<".getcwd().">")
577599
endfun

runtime/doc/eval.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.3. Last change: 2011 Aug 29
1+
*eval.txt* For Vim version 7.3. Last change: 2011 Sep 30
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6374,7 +6374,7 @@ last defined. Example: >
63746374
<
63756375
See |:verbose-cmd| for more information.
63766376

6377-
*E124* *E125*
6377+
*E124* *E125* *E853*
63786378
:fu[nction][!] {name}([arguments]) [range] [abort] [dict]
63796379
Define a new function by the name {name}. The name
63806380
must be made of alphanumeric characters and '_', and

runtime/doc/map.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*map.txt* For Vim version 7.3. Last change: 2011 Aug 19
1+
*map.txt* For Vim version 7.3. Last change: 2011 Oct 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -237,11 +237,18 @@ For this reason the following is blocked:
237237
- Editing another buffer.
238238
- The |:normal| command.
239239
- Moving the cursor is allowed, but it is restored afterwards.
240-
- You can use getchar(), but the existing typeahead isn't seen and new
241-
typeahead is discarded.
242240
If you want the mapping to do any of these let the returned characters do
243241
that.
244242

243+
You can use getchar(), it consumes typeahead if there is any. E.g., if you
244+
have these mappings: >
245+
inoremap <expr> <C-L> nr2char(getchar())
246+
inoremap <expr> <C-L>x "foo"
247+
If you now type CTRL-L nothing happens yet, Vim needs the next character to
248+
decide what mapping to use. If you type 'x' the second mapping is used and
249+
"foo" is inserted. If you type 'a' the first mapping is used, getchar() gets
250+
the 'a' and returns it.
251+
245252
Here is an example that inserts a list number that increases: >
246253
let counter = 0
247254
inoremap <expr> <C-L> ListItem()

runtime/doc/mbyte.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*mbyte.txt* For Vim version 7.3. Last change: 2011 Jul 18
1+
*mbyte.txt* For Vim version 7.3. Last change: 2011 Oct 15
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -797,8 +797,8 @@ is suitable for complex input, such as CJK.
797797
number of Hira-gana characters are 76. So, first, we pre-input text as
798798
pronounced in Hira-gana, second, we convert Hira-gana to Kanji or Kata-Kana,
799799
if needed. There are some Kana-Kanji conversion server: jserver
800-
(distributed with Wnn, see below) and canna. Canna could be found at:
801-
ftp://ftp.nec.co.jp/pub/Canna/ (no longer works).
800+
(distributed with Wnn, see below) and canna. Canna can be found at:
801+
http://canna.sourceforge.jp/
802802

803803
There is a good input system: Wnn4.2. Wnn 4.2 contains,
804804
xwnmo (|IM-server|)

runtime/doc/netbeans.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*netbeans.txt* For Vim version 7.3. Last change: 2010 Sep 29
1+
*netbeans.txt* For Vim version 7.3. Last change: 2011 Oct 20
22

33

44
VIM REFERENCE MANUAL by Gordon Prieur et al.

runtime/doc/options.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.3. Last change: 2011 Sep 09
1+
*options.txt* For Vim version 7.3. Last change: 2011 Sep 30
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6762,8 +6762,8 @@ A jump table for the options with a short description can be found at |Q_op|.
67626762
usetab Like "useopen", but also consider windows in other tab
67636763
pages.
67646764
split If included, split the current window before loading
6765-
a buffer. Otherwise: do not split, use current window.
6766-
Supported in |quickfix| commands that display errors.
6765+
a buffer for a |quickfix| command that display errors.
6766+
Otherwise: do not split, use current window.
67676767
newtab Like "split", but open a new tab page. Overrules
67686768
"split" when both are present.
67696769

runtime/doc/pattern.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*pattern.txt* For Vim version 7.3. Last change: 2011 Jul 20
1+
*pattern.txt* For Vim version 7.3. Last change: 2011 Sep 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -21,7 +21,7 @@ explanations are in chapter 27 |usr_27.txt|.
2121
10. Highlighting matches |match-highlight|
2222

2323
==============================================================================
24-
1. Search commands *search-commands* *E486*
24+
1. Search commands *search-commands*
2525

2626
*/*
2727
/{pattern}[/]<CR> Search forward for the [count]'th occurrence of
@@ -150,6 +150,11 @@ use <Esc> to abandon the search.
150150
All matches for the last used search pattern will be highlighted if you set
151151
the 'hlsearch' option. This can be suspended with the |:nohlsearch| command.
152152

153+
When no match is found you get the error: *E486* Pattern not found
154+
Note that for the |:global| command this behaves like a normal message, for Vi
155+
compatibility. For the |:s| command the "e" flag can be used to avoid the
156+
error message |:s_flags|.
157+
153158
*search-offset* *{offset}*
154159
These commands search for the specified pattern. With "/" and "?" an
155160
additional offset may be given. There are two types of offsets: line offsets

0 commit comments

Comments
 (0)