OSDN > Find 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-056

diff -r 2ae2dd2591fa -r 6974b167d75e src/message.c

--- a/src/message.c Mon Aug 06 20:28:43 2007 +0000

+++ b/src/message.c Tue Aug 07 20:00:31 2007 +0000

		@@ -1878,7 +1878,7 @@
1878	1878	/* output postponed text */
1879	1879	t_puts(&t_col, t_s, s, attr);
1880	1880
1881		- /* When no more prompt an no more room, truncate here */
	1881	+ /* When no more prompt and no more room, truncate here */
1882	1882	if (msg_no_more && lines_left == 0)
1883	1883	break;
1884	1884

		@@ -1927,7 +1927,8 @@
1927	1927	* If screen is completely filled and 'more' is set then wait
1928	1928	* for a character.
1929	1929	*/
1930		- --lines_left;
	1930	+ if (lines_left > 0)
	1931	+ --lines_left;
1931	1932	if (p_more && lines_left == 0 && State != HITRETURN
1932	1933	&& !msg_no_more && !exmode_active)
1933	1934	{

		@@ -2234,7 +2235,7 @@
2234	2235	{
2235	2236	msgchunk_T *mp;
2236	2237
2237		- /* Only show somethign if there is more than one line, otherwise it looks
	2238	+ /* Only show something if there is more than one line, otherwise it looks
2238	2239	* weird, typing a command without output results in one line. */
2239	2240	mp = msg_sb_start(last_msgchunk);
2240	2241	if (mp == NULL \|\| mp->sb_prev == NULL)

		@@ -2622,7 +2623,7 @@
2622	2623	}
2623	2624	}
2624	2625
2625		- if (scroll < 0 \|\| (scroll == 0 && mp_last != NULL))
	2626	+ if (scroll <= 0)
2626	2627	{
2627	2628	/* displayed the requested text, more prompt again */
2628	2629	screen_fill((int)Rows - 1, (int)Rows, 0,

diff -r 2ae2dd2591fa -r 6974b167d75e src/version.c

--- a/src/version.c Mon Aug 06 20:28:43 2007 +0000

+++ b/src/version.c Tue Aug 07 20:00:31 2007 +0000

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