Mercurial > vim
changeset 4645:c316a30a8892 v7.3.1070
updated for version 7.3.1070
Problem: Vim crashes in Python tests. Compiler warning for unused function.
Solution: Disable the tests for now. Move the function.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Thu, 30 May 2013 15:38:24 +0200 |
parents | ac9b091fbd16 |
children | 6702a3ddd7e2 |
files | src/if_py_both.h src/if_python.c src/testdir/test86.in src/testdir/test87.in src/version.c |
diffstat | 5 files changed, 21 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -2322,18 +2322,6 @@ set_option_value_for(key, numval, string return VimTryEnd(); } - static void * -py_memsave(void *p, size_t len) -{ - void *r; - if (!(r = PyMem_Malloc(len))) - return NULL; - mch_memmove(r, p, len); - return r; -} - -#define PY_STRSAVE(s) ((char_u *) py_memsave(s, STRLEN(s) + 1)) - static int OptionsAssItem(OptionsObject *self, PyObject *keyObject, PyObject *valObject) {
--- a/src/if_python.c +++ b/src/if_python.c @@ -737,6 +737,21 @@ static PyObject *FunctionGetattr(PyObjec } #endif +#if defined(HAVE_LOCALE_H) || defined(X_LOCALE) + static void * +py_memsave(void *p, size_t len) +{ + void *r; + + if (!(r = PyMem_Malloc(len))) + return NULL; + mch_memmove(r, p, len); + return r; +} + +# define PY_STRSAVE(s) ((char_u *) py_memsave(s, STRLEN(s) + 1)) +#endif + /* * Include the code shared with if_python3.c */
--- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -8,6 +8,8 @@ See http://svn.python.org/view/python/tr STARTTEST :so small.vim :set encoding=latin1 +:" HACK: currently crashes, skip the test +:e! test.ok | wq! test.out :if !has('python') | e! test.ok | wq! test.out | endif :lang C :py import vim