diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-22 12:03:30 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-22 12:03:30 +0100 |
| commit | 2ace1bd652211506b60faddb8243e48400c89492 (patch) | |
| tree | 04f880849ca0682b517d86bd30b1706e6deebba1 /src/os_unix.c | |
| parent | ba64ba093520e85d6bed2595960edb693bdb4c51 (diff) | |
patch 8.1.1034: too many #ifdefsv8.1.1034
Problem: Too many #ifdefs.
Solution: Merge FEAT_MOUSE_SGR into FEAT_MOUSE_XTERM / FEAT_MOUSE_TTY.
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 0d9f69e53f..b3982979b1 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -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 |