0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 8.1.1034: too many #ifdefs

Problem:    Too many #ifdefs.
Solution:   Merge FEAT_MOUSE_SGR into FEAT_MOUSE_XTERM / FEAT_MOUSE_TTY.
This commit is contained in:
Bram Moolenaar
2019-03-22 12:03:30 +01:00
parent ba64ba0935
commit 2ace1bd652
6 changed files with 19 additions and 54 deletions

View File

@@ -3596,7 +3596,6 @@ mch_setmouse(int on)
}
# endif
# ifdef FEAT_MOUSE_SGR
if (ttym_flags == TTYM_SGR)
{
/* SGR mode supports columns above 223 */
@@ -3606,7 +3605,6 @@ mch_setmouse(int on)
: IF_EB("\033[?1006l", ESC_STR "[?1006l")));
mouse_ison = on;
}
# endif
# ifdef FEAT_BEVAL_TERM
if (bevalterm_ison != (p_bevalterm && on))
@@ -3864,11 +3862,10 @@ check_mouse_termcode(void)
else
del_mouse_termcode(KS_URXVT_MOUSE);
# endif
# ifdef FEAT_MOUSE_SGR
if (use_xterm_mouse() == 4
# ifdef FEAT_GUI
# ifdef FEAT_GUI
&& !gui.in_use
# endif
# endif
)
{
set_mouse_termcode(KS_SGR_MOUSE, (char_u *)(term_is_8bit(T_NAME)
@@ -3890,7 +3887,6 @@ check_mouse_termcode(void)
del_mouse_termcode(KS_SGR_MOUSE);
del_mouse_termcode(KS_SGR_MOUSE_RELEASE);
}
# endif
}
#endif