diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-01-21 22:16:51 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-01-21 22:16:51 +0000 |
commit | 0ac9379acfad03dd478bd4b0e1e1b3c267dbdeba (patch) | |
tree | db3f16f6c0f6fc8772af1e94a513a31887d70d25 /src | |
parent | c716c306e926156e24823fc0d365c64d7fdef165 (diff) | |
download | vim-git-0ac9379acfad03dd478bd4b0e1e1b3c267dbdeba.tar.gz |
updated for version 7.0184v7.0184
Diffstat (limited to 'src')
-rw-r--r-- | src/eval.c | 2 | ||||
-rw-r--r-- | src/ex_cmds.c | 2 | ||||
-rw-r--r-- | src/globals.h | 2 | ||||
-rw-r--r-- | src/if_python.c | 6 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 737dfa64c..e93182f87 100644 --- a/src/eval.c +++ b/src/eval.c @@ -13579,8 +13579,10 @@ f_setqflist(argvars, rettv) typval_T *argvars; typval_T *rettv; { +#ifdef FEAT_QUICKFIX char_u *act; int action = ' '; +#endif rettv->vval.v_number = -1; diff --git a/src/ex_cmds.c b/src/ex_cmds.c index c8912cae0..dff491a37 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2637,7 +2637,7 @@ check_overwrite(eap, buf, fname, ffname, other) if (!eap->forceit && !eap->append) { #ifdef UNIX - /* with UNIX it is possible to open a directory */ + /* with UNIX it is possible to open a directory */ if (mch_isdir(ffname)) { EMSG2(_(e_isadir2), ffname); diff --git a/src/globals.h b/src/globals.h index 6a46485fb..b41c9e055 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1288,7 +1288,7 @@ EXTERN char_u e_invexpr2[] INIT(= N_("E15: Invalid expression: %s")); #endif EXTERN char_u e_invrange[] INIT(= N_("E16: Invalid range")); EXTERN char_u e_invcmd[] INIT(= N_("E476: Invalid command")); -#if defined(UNIX) || (defined(FEAT_SYN_HL) && defined(FEAT_MBYTE)) +#if defined(UNIX) || defined(FEAT_SYN_HL) EXTERN char_u e_isadir2[] INIT(= N_("E17: \"%s\" is a directory")); #endif #ifdef FEAT_LIBCALL diff --git a/src/if_python.c b/src/if_python.c index c1b3bf817..d0ce4015a 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -93,11 +93,13 @@ struct PyMethodDef { int a; }; # define PyInt_FromLong dll_PyInt_FromLong # define PyInt_Type (*dll_PyInt_Type) # define PyList_GetItem dll_PyList_GetItem +# define PyList_Append dll_PyList_Append # define PyList_New dll_PyList_New # define PyList_SetItem dll_PyList_SetItem # define PyList_Size dll_PyList_Size # define PyList_Type (*dll_PyList_Type) # define PyImport_ImportModule dll_PyImport_ImportModule +# define PyDict_New dll_PyDict_New # define PyDict_GetItemString dll_PyDict_GetItemString # define PyModule_GetDict dll_PyModule_GetDict # define PyRun_SimpleString dll_PyRun_SimpleString @@ -149,11 +151,13 @@ static long(*dll_PyInt_AsLong)(PyObject *); static PyObject*(*dll_PyInt_FromLong)(long); static PyTypeObject* dll_PyInt_Type; static PyObject*(*dll_PyList_GetItem)(PyObject *, int); +static PyObject*(*dll_PyList_Append)(PyObject *, PyObject *); static PyObject*(*dll_PyList_New)(int size); static int(*dll_PyList_SetItem)(PyObject *, int, PyObject *); static int(*dll_PyList_Size)(PyObject *); static PyTypeObject* dll_PyList_Type; static PyObject*(*dll_PyImport_ImportModule)(const char *); +static PyObject*(*dll_PyDict_New)(void); static PyObject*(*dll_PyDict_GetItemString)(PyObject *, const char *); static PyObject*(*dll_PyModule_GetDict)(PyObject *); static int(*dll_PyRun_SimpleString)(char *); @@ -227,12 +231,14 @@ static struct {"PyInt_FromLong", (PYTHON_PROC*)&dll_PyInt_FromLong}, {"PyInt_Type", (PYTHON_PROC*)&dll_PyInt_Type}, {"PyList_GetItem", (PYTHON_PROC*)&dll_PyList_GetItem}, + {"PyList_Append", (PYTHON_PROC*)&dll_PyList_Append}, {"PyList_New", (PYTHON_PROC*)&dll_PyList_New}, {"PyList_SetItem", (PYTHON_PROC*)&dll_PyList_SetItem}, {"PyList_Size", (PYTHON_PROC*)&dll_PyList_Size}, {"PyList_Type", (PYTHON_PROC*)&dll_PyList_Type}, {"PyImport_ImportModule", (PYTHON_PROC*)&dll_PyImport_ImportModule}, {"PyDict_GetItemString", (PYTHON_PROC*)&dll_PyDict_GetItemString}, + {"PyDict_New", (PYTHON_PROC*)&dll_PyDict_New}, {"PyModule_GetDict", (PYTHON_PROC*)&dll_PyModule_GetDict}, {"PyRun_SimpleString", (PYTHON_PROC*)&dll_PyRun_SimpleString}, {"PyString_AsString", (PYTHON_PROC*)&dll_PyString_AsString}, |