summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-07-24 14:24:48 +0000
committerBram Moolenaar <Bram@vim.org>2008-07-24 14:24:48 +0000
commit01dd60cb9156c4a361558995323c018d2ead7ad1 (patch)
tree291fbef29826e7a1ae970a557cf2aae9ecdab7c6 /src
parent688e5f7ee7e9384494e9c16ae48c512980c54e4f (diff)
downloadvim-git-01dd60cb9156c4a361558995323c018d2ead7ad1.tar.gz
updated for version 7.2b-014v7.2b.014
Diffstat (limited to 'src')
-rwxr-xr-xsrc/auto/configure9
-rw-r--r--src/configure.in9
-rw-r--r--src/if_perl.xs6
-rw-r--r--src/if_python.c6
-rw-r--r--src/version.c4
5 files changed, 24 insertions, 10 deletions
diff --git a/src/auto/configure b/src/auto/configure
index 1843a9e38..b965261e0 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5114,16 +5114,17 @@ $as_echo "can't find it!" >&6; }
$as_echo_n "(cached) " >&6
else
- tmp_mkf="/tmp/Makefile-conf$$"
- cat ${PYTHON_CONFDIR}/Makefile - <<'eof' >${tmp_mkf}
+ pwd=`pwd`
+ tmp_mkf="$pwd/config-PyMake$$"
+ cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
__:
@echo "python_MODLIBS='$(MODLIBS)'"
@echo "python_LIBS='$(LIBS)'"
@echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
eof
- eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`"
- rm -f ${tmp_mkf}
+ eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ rm -f -- "${tmp_mkf}"
if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
vi_cv_path_python_plibs="-framework Python"
diff --git a/src/configure.in b/src/configure.in
index 49acc196b..8eaddcbd0 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -678,8 +678,9 @@ if test "$enable_pythoninterp" = "yes"; then
dnl see what the interpreter is built from
AC_CACHE_VAL(vi_cv_path_python_plibs,
[
- tmp_mkf="/tmp/Makefile-conf$$"
- cat ${PYTHON_CONFDIR}/Makefile - <<'eof' >${tmp_mkf}
+ pwd=`pwd`
+ tmp_mkf="$pwd/config-PyMake$$"
+ cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
__:
@echo "python_MODLIBS='$(MODLIBS)'"
@echo "python_LIBS='$(LIBS)'"
@@ -687,8 +688,8 @@ __:
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
eof
dnl -- delete the lines from make about Entering/Leaving directory
- eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`"
- rm -f ${tmp_mkf}
+ eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ rm -f -- "${tmp_mkf}"
if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
vi_cv_path_python_plibs="-framework Python"
diff --git a/src/if_perl.xs b/src/if_perl.xs
index a6994f694..5b0449a11 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -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_SetOption);
XS(XS_VIM_DoCommand);
diff --git a/src/if_python.c b/src/if_python.c
index 66e792bec..baf505c59 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -1120,6 +1120,7 @@ VimCommand(PyObject *self, PyObject *args)
return result;
}
+#ifdef FEAT_EVAL
/*
* Function to translate a typval_T into a PyObject; this will recursively
* 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);
PyDict_SetItemString(lookupDict, ptrBuf, result);
}
-#ifdef FEAT_FLOAT
+# ifdef FEAT_FLOAT
else if (our_tv->v_type == VAR_FLOAT)
{
char buf[NUMBUFLEN];
@@ -1171,7 +1172,7 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
result = Py_BuildValue("s", buf);
PyDict_SetItemString(lookupDict, ptrBuf, result);
}
-#endif
+# endif
else if (our_tv->v_type == VAR_LIST)
{
list_T *list = our_tv->vval.v_list;
@@ -1224,6 +1225,7 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
return result;
}
+#endif
/*ARGSUSED*/
static PyObject *
diff --git a/src/version.c b/src/version.c
index f46ebda2c..28ac16a26 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,10 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 14,
+/**/
+ 13,
+/**/
12,
/**/
11,