aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.2b-014

Browse Source
This commit is contained in:
Bram Moolenaar
2008-07-24 14:24:48 +00:00
parent 688e5f7ee7
commit 01dd60cb91
5 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/auto/configure vendored
View File

@@ -5114,16 +5114,17 @@ $as_echo "can't find it!" >&6; }
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
tmp_mkf="/tmp/Makefile-conf$$" pwd=`pwd`
cat ${PYTHON_CONFDIR}/Makefile - <<'eof' >${tmp_mkf} tmp_mkf="$pwd/config-PyMake$$"
cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
__: __:
@echo "python_MODLIBS='$(MODLIBS)'" @echo "python_MODLIBS='$(MODLIBS)'"
@echo "python_LIBS='$(LIBS)'" @echo "python_LIBS='$(LIBS)'"
@echo "python_SYSLIBS='$(SYSLIBS)'" @echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'" @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
eof eof
eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`" eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f ${tmp_mkf} rm -f -- "${tmp_mkf}"
if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
vi_cv_path_python_plibs="-framework Python" vi_cv_path_python_plibs="-framework Python"

9
src/configure.in
View File

@@ -678,8 +678,9 @@ if test "$enable_pythoninterp" = "yes"; then
dnl see what the interpreter is built from dnl see what the interpreter is built from
AC_CACHE_VAL(vi_cv_path_python_plibs, AC_CACHE_VAL(vi_cv_path_python_plibs,
[ [
tmp_mkf="/tmp/Makefile-conf$$" pwd=`pwd`
cat ${PYTHON_CONFDIR}/Makefile - <<'eof' >${tmp_mkf} tmp_mkf="$pwd/config-PyMake$$"
cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
__: __:
@echo "python_MODLIBS='$(MODLIBS)'" @echo "python_MODLIBS='$(MODLIBS)'"
@echo "python_LIBS='$(LIBS)'" @echo "python_LIBS='$(LIBS)'"
@@ -687,8 +688,8 @@ __:
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'" @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
eof eof
dnl -- delete the lines from make about Entering/Leaving directory dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`" eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f ${tmp_mkf} rm -f -- "${tmp_mkf}"
if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
vi_cv_path_python_plibs="-framework Python" vi_cv_path_python_plibs="-framework Python"

6
src/if_perl.xs
View File

@@ -843,6 +843,12 @@ err:
} }
} }
#ifndef FEAT_WINDOWS
int win_valid(win_T *w) { return TRUE; }
int win_count() { return 1; }
win_T *win_find_nr(int n) { return curwin; }
#endif
XS(XS_VIM_Msg); XS(XS_VIM_Msg);
XS(XS_VIM_SetOption); XS(XS_VIM_SetOption);
XS(XS_VIM_DoCommand); XS(XS_VIM_DoCommand);

6
src/if_python.c
View File

@@ -1120,6 +1120,7 @@ VimCommand(PyObject *self, PyObject *args)
return result; return result;
} }
#ifdef FEAT_EVAL
/* /*
* Function to translate a typval_T into a PyObject; this will recursively * Function to translate a typval_T into a PyObject; this will recursively
* translate lists/dictionaries into their Python equivalents. * translate lists/dictionaries into their Python equivalents.
@@ -1162,7 +1163,7 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
result = Py_BuildValue("s", buf); result = Py_BuildValue("s", buf);
PyDict_SetItemString(lookupDict, ptrBuf, result); PyDict_SetItemString(lookupDict, ptrBuf, result);
} }
#ifdef FEAT_FLOAT # ifdef FEAT_FLOAT
else if (our_tv->v_type == VAR_FLOAT) else if (our_tv->v_type == VAR_FLOAT)
{ {
char buf[NUMBUFLEN]; char buf[NUMBUFLEN];
@@ -1171,7 +1172,7 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
result = Py_BuildValue("s", buf); result = Py_BuildValue("s", buf);
PyDict_SetItemString(lookupDict, ptrBuf, result); PyDict_SetItemString(lookupDict, ptrBuf, result);
} }
#endif # endif
else if (our_tv->v_type == VAR_LIST) else if (our_tv->v_type == VAR_LIST)
{ {
list_T *list = our_tv->vval.v_list; list_T *list = our_tv->vval.v_list;
@@ -1224,6 +1225,7 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
return result; return result;
} }
#endif
/*ARGSUSED*/ /*ARGSUSED*/
static PyObject * static PyObject *

4
src/version.c
View File

@@ -676,6 +676,10 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
14,
/**/
13,
/**/ /**/
12, 12,
/**/ /**/