diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-11-06 20:23:35 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-11-06 20:23:35 +0300 |
| commit | 24a353364d6d186d528009fd0bb603d87183cf35 (patch) | |
| tree | a4070dc00731475d6bbdd3c84e61806b33802f7a /runtime/autoload | |
| parent | f2660bee6aca35be3d0ddb1d225784476c13cd27 (diff) | |
| parent | 946c2a8ee85830c543e389724575ae531e89b170 (diff) | |
| download | rneovim-24a353364d6d186d528009fd0bb603d87183cf35.tar.gz rneovim-24a353364d6d186d528009fd0bb603d87183cf35.tar.bz2 rneovim-24a353364d6d186d528009fd0bb603d87183cf35.zip | |
Merge branch 'master' into expression-parser
Diffstat (limited to 'runtime/autoload')
| -rw-r--r-- | runtime/autoload/javascriptcomplete.vim | 4 | ||||
| -rw-r--r-- | runtime/autoload/spellfile.vim | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/runtime/autoload/javascriptcomplete.vim b/runtime/autoload/javascriptcomplete.vim index 2abe41b463..14bc3d7ce3 100644 --- a/runtime/autoload/javascriptcomplete.vim +++ b/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 Apr 30 +" Last Change: 2017 Mar 04 function! javascriptcomplete#CompleteJS(findstart, base) if a:findstart @@ -563,7 +563,7 @@ function! javascriptcomplete#CompleteJS(findstart, base) for i in arguments let g:ia = i let f_elements = matchlist(i, 'function\s\+\(\k\+\)\s*(\(.\{-}\))') - if len(f_elements) == 3 + if len(f_elements) >= 3 let b:js_menuinfo[f_elements[1].'('] = f_elements[2] endif endfor diff --git a/runtime/autoload/spellfile.vim b/runtime/autoload/spellfile.vim index a5ffa514ea..fe7113b9a4 100644 --- a/runtime/autoload/spellfile.vim +++ b/runtime/autoload/spellfile.vim @@ -88,8 +88,8 @@ function! spellfile#LoadFile(lang) endif endif if newbufnr == winbufnr(0) - " We are back the old buffer, remove any (half-finished) download. - g/^/d_ + " We are back to the old buffer, remove any (half-finished) download. + keeppatterns g/^/d_ else let newbufnr = winbufnr(0) endif @@ -127,7 +127,7 @@ function! spellfile#LoadFile(lang) exe "write " . dirname . '/' . fname " Also download the .sug file. - g/^/d_ + keeppatterns g/^/d_ let fname = substitute(fname, '\.spl$', '.sug', '') echo 'Downloading ' . fname . '...' call spellfile#Nread(fname) |