Mercurial > vim
diff src/if_py_both.h @ 4133:36fd800b8c6c v7.3.819
updated for version 7.3.819
Problem: Compiling without +eval and with Python isn't working.
Solution: Add the eval feature when building with Python.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 14 Feb 2013 22:11:39 +0100 |
| parents | 3e22fe67fa69 |
| children | d8acfc49d94e |
line wrap: on
line diff
--- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -310,7 +310,6 @@ VimCommand(PyObject *self UNUSED, PyObje return result; } -#ifdef FEAT_EVAL /* * Function to translate a typval_T into a PyObject; this will recursively * translate lists/dictionaries into their Python equivalents. @@ -425,12 +424,10 @@ VimToPython(typval_T *our_tv, int depth, return result; } -#endif static PyObject * VimEval(PyObject *self UNUSED, PyObject *args UNUSED) { -#ifdef FEAT_EVAL char *expr; typval_T *our_tv; PyObject *result; @@ -466,10 +463,6 @@ VimEval(PyObject *self UNUSED, PyObject Py_END_ALLOW_THREADS return result; -#else - PyErr_SetVim(_("expressions disabled at compile time")); - return NULL; -#endif } static PyObject *ConvertToPyObject(typval_T *); @@ -477,7 +470,6 @@ static PyObject *ConvertToPyObject(typva static PyObject * VimEvalPy(PyObject *self UNUSED, PyObject *args UNUSED) { -#ifdef FEAT_EVAL char *expr; typval_T *our_tv; PyObject *result; @@ -506,10 +498,6 @@ VimEvalPy(PyObject *self UNUSED, PyObjec Py_END_ALLOW_THREADS return result; -#else - PyErr_SetVim(_("expressions disabled at compile time")); - return NULL; -#endif } static PyObject * @@ -946,7 +934,7 @@ DictionaryAssItem(PyObject *self, PyObje } static PyObject * -DictionaryListKeys(PyObject *self) +DictionaryListKeys(PyObject *self UNUSED) { dict_T *dict = ((DictionaryObject *)(self))->dict; long_u todo = dict->dv_hashtab.ht_used; @@ -2549,7 +2537,6 @@ set_string_copy(char_u *str, typval_T *t return 0; } -#ifdef FEAT_EVAL typedef int (*pytotvfunc)(PyObject *, typval_T *, PyObject *); static int @@ -2781,4 +2768,3 @@ ConvertToPyObject(typval_T *tv) return NULL; } } -#endif