updated for version 7.2b-014

diff --git a/src/auto/configure b/src/auto/configure
index 1843a9e38222f37f1b65550d8fa2d57457cfe295..b965261e0abb534a4e9788c8725e4c8ab1bec0b9 100755 (executable)
--- 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 49acc196b95a9388c611a70cbba9e433184ac50b..8eaddcbd0bd9d984a34cca3294c3b5bbe69e329c 100644 (file)
--- 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 a6994f694e0fb4e1c0b3ed850a36d684b5efb15e..5b0449a11236aad50667bec132fa903da3a45caf 100644 (file)
--- 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 66e792becc60cd61b8cdfc0df072f7c08d99c1bf..baf505c594eb19e22e3febacc4189c81e40d09d6 100644 (file)
--- 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 f46ebda2c56762368a5f06309baed0dc26a5bf0c..28ac16a26af45326712a3eae8c969f26698a308a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    14,
+/**/
+    13,
 /**/
     12,
 /**/