diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-27 09:29:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 09:29:23 -0400 |
| commit | 8bc55f656a57d1387c3506a2abb0f9ad20ef07af (patch) | |
| tree | d1b362f6205d0d01f3f007d35682983e62a1d367 | |
| parent | 430ad9ab20b97b4c9a60732117e618bbe5236765 (diff) | |
| parent | 53efdedca97072f7463830d49f5d755801471c09 (diff) | |
| download | rneovim-8bc55f656a57d1387c3506a2abb0f9ad20ef07af.tar.gz rneovim-8bc55f656a57d1387c3506a2abb0f9ad20ef07af.tar.bz2 rneovim-8bc55f656a57d1387c3506a2abb0f9ad20ef07af.zip | |
Merge pull request #12922 from AlxHnr/master
Use HTTPS for downloading spell files
| -rw-r--r-- | runtime/autoload/spellfile.vim | 10 | ||||
| -rw-r--r-- | runtime/doc/spell.txt | 11 |
2 files changed, 9 insertions, 12 deletions
diff --git a/runtime/autoload/spellfile.vim b/runtime/autoload/spellfile.vim index d098902305..e36e2f936b 100644 --- a/runtime/autoload/spellfile.vim +++ b/runtime/autoload/spellfile.vim @@ -1,13 +1,9 @@ " Vim script to download a missing spell file if !exists('g:spellfile_URL') - " Prefer using http:// when netrw should be able to use it, since - " more firewalls let this through. - if executable("curl") || executable("wget") || executable("fetch") - let g:spellfile_URL = 'http://ftp.vim.org/pub/vim/runtime/spell' - else - let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell' - endif + " Always use https:// because it's secure. The certificate is for nluug.nl, + " thus we can't use the alias ftp.vim.org here. + let g:spellfile_URL = 'https://ftp.nluug.nl/pub/vim/runtime/spell' endif let s:spellfile_URL = '' " Start with nothing so that s:donedict is reset. diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 8350d49c59..0eef976819 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -620,11 +620,12 @@ ask you where to write the file (there must be a writable directory in 'runtimepath' for this). The plugin has a default place where to look for spell files, on the Vim ftp -server. If you want to use another location or another protocol, set the -g:spellfile_URL variable to the directory that holds the spell files. The -|netrw| plugin is used for getting the file, look there for the specific -syntax of the URL. Example: > - let g:spellfile_URL = 'http://ftp.vim.org/vim/runtime/spell' +server. The protocol used is SSL (https://) for security. If you want to use +another location or another protocol, set the g:spellfile_URL variable to the +directory that holds the spell files. You can use http:// or ftp://, but you +are taking a security risk then. The |netrw| plugin is used for getting the +file, look there for the specific syntax of the URL. Example: > + let g:spellfile_URL = 'https://ftp.nluug.nl/vim/runtime/spell' You may need to escape special characters. The plugin will only ask about downloading a language once. If you want to |