diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-12-07 22:23:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-12-07 22:23:04 +0100 |
| commit | 3388d334572f9d65a603d09d75e363805d96c5d9 (patch) | |
| tree | 181aa5869c33377419fccbcc140801cfeeeffc23 | |
| parent | 6e65d594aa33be11f6074f26e9ff81b52504c62b (diff) | |
| download | vim-git-3388d334572f9d65a603d09d75e363805d96c5d9.tar.gz | |
patch 8.0.1378: autoload script sources itself when defining functionv8.0.1378
Problem: Autoload script sources itself when defining function.
Solution: Pass TFN_NO_AUTOLOAD to trans_function_name(). (Yasuhiro
Matsumoto, closes #2423)
| -rw-r--r-- | src/testdir/sautest/autoload/sourced.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_autoload.vim | 8 | ||||
| -rw-r--r-- | src/userfunc.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/src/testdir/sautest/autoload/sourced.vim b/src/testdir/sautest/autoload/sourced.vim new file mode 100644 index 000000000..f69f00cb5 --- /dev/null +++ b/src/testdir/sautest/autoload/sourced.vim @@ -0,0 +1,3 @@ +let g:loaded_sourced_vim += 1 +func! sourced#something() +endfunc diff --git a/src/testdir/test_autoload.vim b/src/testdir/test_autoload.vim index a92851f65..7396c227c 100644 --- a/src/testdir/test_autoload.vim +++ b/src/testdir/test_autoload.vim @@ -2,10 +2,16 @@ set runtimepath=./sautest -func! Test_autoload_dict_func() +func Test_autoload_dict_func() let g:loaded_foo_vim = 0 let g:called_foo_bar_echo = 0 call g:foo#bar.echo() call assert_equal(1, g:loaded_foo_vim) call assert_equal(1, g:called_foo_bar_echo) endfunc + +func Test_source_autoload() + let g:loaded_sourced_vim = 0 + source sautest/autoload/sourced.vim + call assert_equal(1, g:loaded_sourced_vim) +endfunc diff --git a/src/userfunc.c b/src/userfunc.c index 9b6055440..580df0bf8 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -1886,7 +1886,7 @@ ex_function(exarg_T *eap) * g:func global function name, same as "func" */ p = eap->arg; - name = trans_function_name(&p, eap->skip, 0, &fudi, NULL); + name = trans_function_name(&p, eap->skip, TFN_NO_AUTOLOAD, &fudi, NULL); paren = (vim_strchr(p, '(') != NULL); if (name == NULL && (fudi.fd_dict == NULL || !paren) && !eap->skip) { diff --git a/src/version.c b/src/version.c index 7fe7e8f2c..70340e045 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1378, +/**/ 1377, /**/ 1376, |