OSDN > 브라 우즈 소프트웨어 > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

updated for version 7.2b-014

diff -r 0a908b65de1d -r fe4ebbec775a src/auto/configure

--- a/src/auto/configure Thu Jul 24 11:51:40 2008 +0000

+++ b/src/auto/configure Thu Jul 24 14:24:48 2008 +0000

		@@ -5114,16 +5114,17 @@
5114	5114	$as_echo_n "(cached) " >&6
5115	5115	else
5116	5116
5117		- tmp_mkf="/tmp/Makefile-conf$$"
5118		- cat ${PYTHON_CONFDIR}/Makefile - <<'eof' >${tmp_mkf}
	5117	+ pwd=`pwd`
	5118	+ tmp_mkf="$pwd/config-PyMake$$"
	5119	+ cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
5119	5120	__:
5120	5121	@echo "python_MODLIBS='$(MODLIBS)'"
5121	5122	@echo "python_LIBS='$(LIBS)'"
5122	5123	@echo "python_SYSLIBS='$(SYSLIBS)'"
5123	5124	@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
5124	5125	eof
5125		- eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ \| sed '/ directory /d'`"
5126		- rm -f ${tmp_mkf}
	5126	+ eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ \| sed '/ directory /d'`"
	5127	+ rm -f -- "${tmp_mkf}"
5127	5128	if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
5128	5129	"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
5129	5130	vi_cv_path_python_plibs="-framework Python"

diff -r 0a908b65de1d -r fe4ebbec775a src/configure.in

--- a/src/configure.in Thu Jul 24 11:51:40 2008 +0000

+++ b/src/configure.in Thu Jul 24 14:24:48 2008 +0000

		@@ -678,8 +678,9 @@
678	678	dnl see what the interpreter is built from
679	679	AC_CACHE_VAL(vi_cv_path_python_plibs,
680	680	[
681		- tmp_mkf="/tmp/Makefile-conf$$"
682		- cat ${PYTHON_CONFDIR}/Makefile - <<'eof' >${tmp_mkf}
	681	+ pwd=`pwd`
	682	+ tmp_mkf="$pwd/config-PyMake$$"
	683	+ cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
683	684	__:
684	685	@echo "python_MODLIBS='$(MODLIBS)'"
685	686	@echo "python_LIBS='$(LIBS)'"

		@@ -687,8 +688,8 @@
687	688	@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
688	689	eof
689	690	dnl -- delete the lines from make about Entering/Leaving directory
690		- eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ \| sed '/ directory /d'`"
691		- rm -f ${tmp_mkf}
	691	+ eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ \| sed '/ directory /d'`"
	692	+ rm -f -- "${tmp_mkf}"
692	693	if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
693	694	"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
694	695	vi_cv_path_python_plibs="-framework Python"

diff -r 0a908b65de1d -r fe4ebbec775a src/if_perl.xs

--- a/src/if_perl.xs Thu Jul 24 11:51:40 2008 +0000

+++ b/src/if_perl.xs Thu Jul 24 14:24:48 2008 +0000

		@@ -843,6 +843,12 @@
843	843	}
844	844	}
845	845
	846	+#ifndef FEAT_WINDOWS
	847	+int win_valid(win_T *w) { return TRUE; }
	848	+int win_count() { return 1; }
	849	+win_T *win_find_nr(int n) { return curwin; }
	850	+#endif
	851	+
846	852	XS(XS_VIM_Msg);
847	853	XS(XS_VIM_SetOption);
848	854	XS(XS_VIM_DoCommand);

diff -r 0a908b65de1d -r fe4ebbec775a src/if_python.c

--- a/src/if_python.c Thu Jul 24 11:51:40 2008 +0000

+++ b/src/if_python.c Thu Jul 24 14:24:48 2008 +0000

		@@ -1120,6 +1120,7 @@
1120	1120	return result;
1121	1121	}
1122	1122
	1123	+#ifdef FEAT_EVAL
1123	1124	/*
1124	1125	* Function to translate a typval_T into a PyObject; this will recursively
1125	1126	* translate lists/dictionaries into their Python equivalents.

		@@ -1162,7 +1163,7 @@
1162	1163	result = Py_BuildValue("s", buf);
1163	1164	PyDict_SetItemString(lookupDict, ptrBuf, result);
1164	1165	}
1165		-#ifdef FEAT_FLOAT
	1166	+# ifdef FEAT_FLOAT
1166	1167	else if (our_tv->v_type == VAR_FLOAT)
1167	1168	{
1168	1169	char buf[NUMBUFLEN];

		@@ -1171,7 +1172,7 @@
1171	1172	result = Py_BuildValue("s", buf);
1172	1173	PyDict_SetItemString(lookupDict, ptrBuf, result);
1173	1174	}
1174		-#endif
	1175	+# endif
1175	1176	else if (our_tv->v_type == VAR_LIST)
1176	1177	{
1177	1178	list_T *list = our_tv->vval.v_list;

diff -r 0a908b65de1d -r fe4ebbec775a src/version.c

--- a/src/version.c Thu Jul 24 11:51:40 2008 +0000

+++ b/src/version.c Thu Jul 24 14:24:48 2008 +0000

		@@ -677,6 +677,10 @@
677	677	static int included_patches[] =
678	678	{ /* Add new patch number below this line */
679	679	/**/
	680	+ 14,
	681	+/**/
	682	+ 13,
	683	+/**/
680	684	12,
681	685	/**/
682	686	11,