diff options
| author | Michael Reed <m.reed@mykolab.com> | 2015-02-05 14:29:45 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-02-08 17:46:09 -0500 |
| commit | 10b2a0e52980aba2d1efc072368fcaf1f33e7512 (patch) | |
| tree | 0a71d9b4b2e5d121a5ec2474b12118fbc487be8e /src | |
| parent | 0854c21af3c200a580dc9b0075b9d4ca738a496a (diff) | |
| download | rneovim-10b2a0e52980aba2d1efc072368fcaf1f33e7512.tar.gz rneovim-10b2a0e52980aba2d1efc072368fcaf1f33e7512.tar.bz2 rneovim-10b2a0e52980aba2d1efc072368fcaf1f33e7512.zip | |
Remove 'ttyfast'
refs #1045 #1051
This was enabled by default a while ago (#1051), and has apparently not
created any issues. The amount of actual code related to it is tiny, so
it has been removed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 3 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 1 | ||||
| -rw-r--r-- | src/nvim/screen.c | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 2d16c0fa71..182834c4f3 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1583,9 +1583,6 @@ static vimoption_T {"ttybuiltin", "tbi", P_BOOL|P_VI_DEF, (char_u *)&p_tbi, PV_NONE, {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"ttyfast", "tf", P_BOOL|P_NO_MKRC|P_VI_DEF, - (char_u *)&p_tf, PV_NONE, - {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"ttymouse", "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF, #if defined(FEAT_MOUSE) && defined(UNIX) (char_u *)&p_ttym, PV_NONE, diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 99e8e645b6..c8b63cd155 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -569,7 +569,6 @@ EXTERN char_u *p_tsr; /* 'thesaurus' */ EXTERN int p_ttimeout; /* 'ttimeout' */ EXTERN long p_ttm; /* 'ttimeoutlen' */ EXTERN int p_tbi; /* 'ttybuiltin' */ -EXTERN int p_tf; /* 'ttyfast' */ EXTERN long p_ttyscroll; /* 'ttyscroll' */ #if defined(FEAT_MOUSE) && defined(UNIX) EXTERN char_u *p_ttym; /* 'ttymouse' */ diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 9deaa7979f..7e7a7c1148 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -4196,8 +4196,7 @@ win_line ( * Don't do this for double-width characters. * Don't do this for a window not at the right screen border. */ - if (p_tf - && !(has_mbyte + if (!(has_mbyte && ((*mb_off2cells)(LineOffset[screen_row], LineOffset[screen_row] + screen_Columns) == 2 @@ -7102,8 +7101,9 @@ static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int de return retval; } - if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ + if (wp->w_next != NULL) { return FAIL; + } return MAYBE; } |