Mercurial > vim

diff src/os_unix.c @ 16058:012f03e583e2 v8.1.1034

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1034: too many #ifdefs commit https://github.com/vim/vim/commit/2ace1bd652211506b60faddb8243e48400c89492 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Mar 22 12:03:30 2019 +0100 patch 8.1.1034: too many #ifdefs Problem: Too many #ifdefs. Solution: Merge FEAT_MOUSE_SGR into FEAT_MOUSE_XTERM / FEAT_MOUSE_TTY.
author Bram Moolenaar <Bram@vim.org>
date Fri, 22 Mar 2019 12:15:04 +0100
parents 78faa25f9698
children cd5c83115ec6
line wrap: on
line diff
--- 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