summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-29 20:31:34 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-29 20:31:34 +0000
commit9526a543cc1815c2bc9d4e0718b320a0b81c1a6f (patch)
tree8725031567c0d8c70531962cf22f11330a180c07
parent9af1ba96e544ec1325e55dac248dc49d2a4ea02a (diff)
updated for version 7.0-076v7.0.076
-rw-r--r--runtime/autoload/spellfile.vim15
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 5 deletions
diff --git a/runtime/autoload/spellfile.vim b/runtime/autoload/spellfile.vim
index 405202da1c..e9694967d1 100644
--- a/runtime/autoload/spellfile.vim
+++ b/runtime/autoload/spellfile.vim
@@ -1,6 +1,6 @@
" Vim script to download a missing spell file
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 May 10
+" Last Change: 2006 Aug 29
if !exists('g:spellfile_URL')
let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
@@ -110,9 +110,14 @@ function! spellfile#LoadFile(lang)
endif
endfunc
-" Read "fname" from the ftp server.
+" Read "fname" from the server.
function! spellfile#Nread(fname)
- let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
- let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
- exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
+ if g:spellfile_URL =~ '^ftp://'
+ " for an ftp server use a default login and password to avoid a prompt
+ let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
+ let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
+ exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
+ else
+ exe 'Nread ' g:spellfile_URL . '/' . a:fname
+ endif
endfunc
diff --git a/src/version.c b/src/version.c
index 13bd394567..722107c73f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 76,
+/**/
75,
/**/
74,