aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.2208: Unix: Tabs in output might be expanded to spaces

Browse Source 
Problem:    Unix: Tabs in output might be expanded to spaces.
Solution:   Reset the XTABS flag. (closes #5108)
This commit is contained in:
Bram Moolenaar 2019-10-24 17:43:25 +02:00
parent edaad6e0a0
commit faf626e5d1
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/os_unix.c
View File

@ -2201,9 +2201,9 @@ mch_settitle(char_u *title, char_u *icon)
if (*T_CIS != NUL) if (*T_CIS != NUL)
{ {
out_str(T_CIS); /* set icon start */ out_str(T_CIS); // set icon start
out_str_nf(icon); out_str_nf(icon);
out_str(T_CIE); /* set icon end */ out_str(T_CIE); // set icon end
out_flush(); out_flush();
} }
#ifdef FEAT_X11 #ifdef FEAT_X11
@ -3456,11 +3456,21 @@ mch_settmode(int tmode)
/* but it breaks function keys on MINT */ /* but it breaks function keys on MINT */
# endif # endif
); );
# ifdef ONLCR /* don't map NL -> CR NL, we do it ourselves */ # ifdef ONLCR
// Don't map NL -> CR NL, we do it ourselves.
// Also disable expanding tabs if possible.
# ifdef XTABS
tnew.c_oflag &= ~(ONLCR | XTABS);
# else
# ifdef TAB3
tnew.c_oflag &= ~(ONLCR | TAB3);
# else
tnew.c_oflag &= ~ONLCR; tnew.c_oflag &= ~ONLCR;
# endif
# endif
# endif # endif
tnew.c_cc[VMIN] = 1; /* return after 1 char */ tnew.c_cc[VMIN] = 1; // return after 1 char
tnew.c_cc[VTIME] = 0; /* don't wait */ tnew.c_cc[VTIME] = 0; // don't wait
} }
else if (tmode == TMODE_SLEEP) else if (tmode == TMODE_SLEEP)
{ {

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2208,
/**/ /**/
2207, 2207,
/**/ /**/