Merge pull request #1782 from fwalch/small-patches

vim-patch: Multiple small patches
This commit is contained in:
Justin M. Keyes 2015-01-13 09:38:19 -05:00
commit 9b4f6fbd33
5 changed files with 19 additions and 2 deletions

View File

@ -4548,7 +4548,7 @@ static void screen_line(int row, int coloff, int endcol, int clear_width, int rl
int c;
c = fillchar_vsep(&hl);
if (ScreenLines[off_to] != c
if (ScreenLines[off_to] != (schar_T)c
|| (enc_utf8 && (int)ScreenLinesUC[off_to]
!= (c >= 0x80 ? c : 0))
|| ScreenAttrs[off_to] != hl) {

View File

@ -44,6 +44,10 @@ $4lDi<-- 'D' should be intact
/^"r"
$5lrxa<-- should be 'x'
:"
:" Test "r" on a tab
:" Note that for this test, 'ts' must be 8 (the default).
^5lrxA<-- should be ' x '
:"
:" Test to make sure 'x' can delete control characters
:set display=uhex
^xxxxxxi[This line should contain only the text between the brackets.]
@ -72,6 +76,7 @@ this is a test
this is a test
this is a test
"r"
"r"
ab sd
abcv6efi.him0kl

View File

@ -12,6 +12,7 @@ this is a test
this is a test
this is a test
"r" x<-- should be 'x'
"r" x <-- should be ' x '
[This line should contain only the text between the brackets.]
v i m <-- should show the name of a noted text editor
6 . 0 <-- and its version number

View File

@ -178,6 +178,13 @@ static char *(features[]) = {
};
static int included_patches[] = {
567,
//566,
//565,
//564,
563,
//562,
//561,
//560 NA
559,
//558 NA
@ -272,6 +279,7 @@ static int included_patches[] = {
//469 NA
468,
467,
466,
//465 NA
//464 NA
463,

View File

@ -371,7 +371,10 @@ newwindow:
postponed_split = Prenum;
else
postponed_split = -1;
g_do_tagpreview = 0;
if (nchar != '}') {
g_do_tagpreview = 0;
}
// Execute the command right here, required when
// "wincmd ]" was used in a function.