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.0-223

diff -r 83eda510dbc0 -r 537cb92935b6 src/charset.c

--- a/src/charset.c Tue Mar 27 09:02:11 2007 +0000

+++ b/src/charset.c Tue Mar 27 10:42:05 2007 +0000

		@@ -317,7 +317,8 @@
317	317	}
318	318	}
319	319
320		-#if defined(FEAT_EVAL) \|\| defined(FEAT_TITLE) \|\| defined(PROTO)
	320	+#if defined(FEAT_EVAL) \|\| defined(FEAT_TITLE) \|\| defined(FEAT_INS_EXPAND) \
	321	+ \|\| defined(PROTO)
321	322	/*
322	323	* Translate a string into allocated memory, replacing special chars with
323	324	* printable chars. Returns NULL when out of memory.

diff -r 83eda510dbc0 -r 537cb92935b6 src/popupmnu.c

--- a/src/popupmnu.c Tue Mar 27 09:02:11 2007 +0000

+++ b/src/popupmnu.c Tue Mar 27 10:42:05 2007 +0000

		@@ -280,8 +280,20 @@
280	280	w = ptr2cells(p);
281	281	if (p == NUL \|\| p == TAB \|\| totwidth + w > pum_width)
282	282	{
283		- /* Display the text that fits or comes before a Tab. */
284		- screen_puts_len(s, (int)(p - s), row, col, attr);
	283	+ /* Display the text that fits or comes before a Tab.
	284	+ * First convert it to printable characters. */
	285	+ char_u *st;
	286	+ int saved = *p;
	287	+
	288	+ *p = NUL;
	289	+ st = transstr(s);
	290	+ *p = saved;
	291	+ if (st != NULL)
	292	+ {
	293	+ screen_puts_len(st, (int)STRLEN(st), row, col,
	294	+ attr);
	295	+ vim_free(st);
	296	+ }
285	297	col += width;
286	298
287	299	if (*p != TAB)

diff -r 83eda510dbc0 -r 537cb92935b6 src/version.c

--- a/src/version.c Tue Mar 27 09:02:11 2007 +0000

+++ b/src/version.c Tue Mar 27 10:42:05 2007 +0000

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