# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1509805805 -3600
# Node ID 2c502179c75d6934caae1cf5ddd640de5e7df3af
# Parent  12964eaed9612988b87cde52cb23635e8f4ab63d
patch 8.0.1258: 'ttymouse' is set to "sgr" even though it's not supported

commit https://github.com/vim/vim/commit/52a2f0f1da4e554a81beb45211a9d09afffde595
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Nov 4 15:16:56 2017 +0100

    patch 8.0.1258: 'ttymouse' is set to "sgr" even though it's not supported

    Problem:    'ttymouse' is set to "sgr" even though it's not supported. (Gary
                Johnson)
    Solution:   Adjust #ifdef

diff --git a/src/term.c b/src/term.c
--- a/src/term.c
+++ b/src/term.c
@@ -4547,22 +4547,6 @@ check_termcode(
 		    {
 			int need_flush = FALSE;
 
-			/* Only set 'ttymouse' automatically if it was not set
-			 * by the user already. */
-			if (!option_was_set((char_u *)"ttym"))
-			{
-# ifdef TTYM_SGR
-			    if (version >= 277)
-				set_option_value((char_u *)"ttym", 0L,
-							  (char_u *)"sgr", 0);
-			    else
-# endif
-			    /* if xterm version >= 95 use mouse dragging */
-			    if (version >= 95)
-				set_option_value((char_u *)"ttym", 0L,
-						       (char_u *)"xterm2", 0);
-			}
-
 			/* if xterm version >= 141 try to get termcap codes */
 			if (version >= 141)
 			{
@@ -4581,6 +4565,28 @@ check_termcode(
 			     * 256, libvterm supports even more. */
 			    if (mch_getenv((char_u *)"COLORS") == NULL)
 				may_adjust_color_count(256);
+# ifdef FEAT_MOUSE_SGR
+			    /* Libvterm can handle SGR mouse reporting. */
+			    if (!option_was_set((char_u *)"ttym"))
+				set_option_value((char_u *)"ttym", 0L,
+							   (char_u *)"sgr", 0);
+# endif
+			}
+
+			/* Only set 'ttymouse' automatically if it was not set
+			 * by the user already. */
+			if (!option_was_set((char_u *)"ttym"))
+			{
+# ifdef FEAT_MOUSE_SGR
+			    if (version >= 277)
+				set_option_value((char_u *)"ttym", 0L,
+							  (char_u *)"sgr", 0);
+			    else
+# endif
+			    /* if xterm version >= 95 use mouse dragging */
+			    if (version >= 95)
+				set_option_value((char_u *)"ttym", 0L,
+						       (char_u *)"xterm2", 0);
 			}
 
 			/* Detect terminals that set $TERM to something like
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1258,
+/**/
     1257,
 /**/
     1256,