OSDN > Pesquisar Software > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

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

updated for version 7.1-156

diff -r 93ffa40b5320 -r 21b11491a33f src/ex_docmd.c

--- a/src/ex_docmd.c Sat Nov 10 21:51:15 2007 +0000

+++ b/src/ex_docmd.c Sun Nov 11 18:17:28 2007 +0000

		@@ -666,7 +666,7 @@
666	666	if (ex_pressedreturn)
667	667	{
668	668	/* go up one line, to overwrite the ":<CR>" line, so the
669		- * output doensn't contain empty lines. */
	669	+ * output doesn't contain empty lines. */
670	670	msg_row = prev_msg_row;
671	671	if (prev_msg_row == Rows - 1)
672	672	msg_row--;

		@@ -2760,7 +2760,7 @@
2760	2760
2761	2761	/*
2762	2762	* Isolate the command and search for it in the command table.
2763		- * Exeptions:
	2763	+ * Exceptions:
2764	2764	* - the 'k' command can directly be followed by any character.
2765	2765	* - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
2766	2766	* but :sre[wind] is another command, as are :scrip[tnames],

		@@ -6677,7 +6677,7 @@
6677	6677	* The list should be allocated using alloc(), as should each item in the
6678	6678	* list. This function takes over responsibility for freeing the list.
6679	6679	*
6680		- * XXX The list is made into the arggument list. This is freed using
	6680	+ * XXX The list is made into the argument list. This is freed using
6681	6681	* FreeWild(), which does a series of vim_free() calls, unless the two defines
6682	6682	* __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
6683	6683	* routine _fnexplodefree() is used. This may cause problems, but as the drop

		@@ -7795,7 +7795,7 @@
7795	7795	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
7796	7796	&& !eap->forceit)
7797	7797	{
7798		- EMSG(_("E747: Cannot change directory, buffer is modifed (add ! to override)"));
	7798	+ EMSG(_("E747: Cannot change directory, buffer is modified (add ! to override)"));
7799	7799	return;
7800	7800	}
7801	7801

		@@ -9391,7 +9391,7 @@
9391	9391	if (src > srcstart && src[-1] == '\\')
9392	9392	{
9393	9393	*usedlen = 0;
9394		- STRCPY(src - 1, src); /* remove backslash */
	9394	+ mch_memmove(src - 1, src, STRLEN(src) + 1); /* remove backslash */
9395	9395	return NULL;
9396	9396	}
9397	9397

diff -r 93ffa40b5320 -r 21b11491a33f src/version.c

--- a/src/version.c Sat Nov 10 21:51:15 2007 +0000

+++ b/src/version.c Sun Nov 11 18:17:28 2007 +0000

		@@ -667,6 +667,8 @@
667	667	static int included_patches[] =
668	668	{ /* Add new patch number below this line */
669	669	/**/
	670	+ 156,
	671	+/**/
670	672	155,
671	673	/**/
672	674	154,