From 018acca3bdf866faa4eacfb403f9d720832c816e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 30 May 2013 13:37:28 +0200 Subject: updated for version 7.3.1068 Problem: Python: Script is auto-loaded on function creation. Solution: Python patch 27. (ZyX) --- src/eval.c | 7 ++----- src/if_py_both.h | 16 +++++----------- src/proto/eval.pro | 1 - src/testdir/test86.ok | 2 +- src/testdir/test87.ok | 2 +- src/version.c | 2 ++ src/vim.h | 3 +++ 7 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/eval.c b/src/eval.c index 06cf4882a..83233c9da 100644 --- a/src/eval.c +++ b/src/eval.c @@ -810,6 +810,7 @@ static int # endif prof_self_cmp __ARGS((const void *s1, const void *s2)); #endif +static int script_autoload __ARGS((char_u *name, int reload)); static char_u *autoload_name __ARGS((char_u *name)); static void cat_func_name __ARGS((char_u *buf, ufunc_T *fp)); static void func_free __ARGS((ufunc_T *fp)); @@ -829,10 +830,6 @@ static int compare_func_name __ARGS((const void *s1, const void *s2)); static void sortFunctions __ARGS(()); #endif - -/* Character used as separated in autoload function/variable names. */ -#define AUTOLOAD_CHAR '#' - /* * Initialize the global and v: variables. */ @@ -22190,7 +22187,7 @@ prof_self_cmp(s1, s2) * If "name" has a package name try autoloading the script for it. * Return TRUE if a package was loaded. */ - int + static int script_autoload(name, reload) char_u *name; int reload; /* load script again when already loaded */ diff --git a/src/if_py_both.h b/src/if_py_both.h index e31509cff..5fe047604 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -2015,19 +2015,13 @@ FunctionNew(PyTypeObject *subtype, char_u *name) func_ref(self->name); } else - { - self->name = get_expanded_name(name, TRUE); - if (self->name == NULL) + if ((self->name = get_expanded_name(name, + vim_strchr(name, AUTOLOAD_CHAR) == NULL)) + == NULL) { - if (script_autoload(name, TRUE) && !aborting()) - self->name = get_expanded_name(name, TRUE); - if (self->name == NULL) - { - PyErr_SetString(PyExc_ValueError, _("function does not exist")); - return NULL; - } + PyErr_SetString(PyExc_ValueError, _("function does not exist")); + return NULL; } - } return (PyObject *)(self); } diff --git a/src/proto/eval.pro b/src/proto/eval.pro index 56f91bba4..3f2816ec2 100644 --- a/src/proto/eval.pro +++ b/src/proto/eval.pro @@ -132,5 +132,4 @@ void last_set_msg __ARGS((scid_T scriptID)); void ex_oldfiles __ARGS((exarg_T *eap)); int modify_fname __ARGS((char_u *src, int *usedlen, char_u **fnamep, char_u **bufp, int *fnamelen)); char_u *do_string_sub __ARGS((char_u *str, char_u *pat, char_u *sub, char_u *flags)); -int script_autoload __ARGS((char_u *name, int reload)); /* vim: set ft=c : */ diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok index 452c48fdb..048458f97 100644 --- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -889,7 +889,7 @@ l.xxx = True:(, AttributeError('cannot set thi >> FunctionConstructor vim.Function("123"):(, ValueError('unnamed function does not exist',)) vim.Function("xxx_non_existent_function_xxx"):(, ValueError('function does not exist',)) -vim.Function("xxx#non#existent#function#xxx"):(, ValueError('function does not exist',)) +vim.Function("xxx#non#existent#function#xxx"):NOT FAILED >> FunctionCall >>> Testing StringToChars using f({%s : 1}) f({1 : 1}):(, TypeError('object must be string',)) diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok index 7a1f6c907..2d361bb74 100644 --- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -878,7 +878,7 @@ l.xxx = True:(, AttributeError('cannot set this attribut >> FunctionConstructor vim.Function("123"):(, ValueError('unnamed function does not exist',)) vim.Function("xxx_non_existent_function_xxx"):(, ValueError('function does not exist',)) -vim.Function("xxx#non#existent#function#xxx"):(, ValueError('function does not exist',)) +vim.Function("xxx#non#existent#function#xxx"):NOT FAILED >> FunctionCall >>> Testing StringToChars using f({%s : 1}) f({1 : 1}):(, TypeError('object must be string',)) diff --git a/src/version.c b/src/version.c index 173f254f9..7a1ab6e98 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1068, /**/ 1067, /**/ diff --git a/src/vim.h b/src/vim.h index 265720aeb..5fb0481d5 100644 --- a/src/vim.h +++ b/src/vim.h @@ -2243,4 +2243,7 @@ typedef int VimClipboard; /* This is required for the prototypes. */ #define SREQ_WIN 1 /* Request window-local option */ #define SREQ_BUF 2 /* Request buffer-local option */ +/* Character used as separated in autoload function/variable names. */ +#define AUTOLOAD_CHAR '#' + #endif /* VIM__H */ -- cgit v1.2.3