updated for version 7.3.699

Problem:    When 'ttymouse' is set to "sgr" manually, it is overruled by
            automatic detection.
Solution:   Do not use automatic detection when 'ttymouse' was set manually.
            (Hayaki Saito)

diff --git a/src/term.c b/src/term.c
index 38fc89b699cc9799d26304cac0545320b42664f2..3efa7a7a1468a9584a7991a990b1e0a8fb182e77 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -4079,24 +4079,22 @@ check_termcode(max_offset, buf, bufsize, buflen)
 
                    if (tp[1 + (tp[0] != CSI)] == '>' && j == 2)
                    {
+                       /* Only set 'ttymouse' automatically if it was not set
+                        * by the user already. */
+                       if (!option_was_set((char_u *)"ttym"))
+                       {
 # ifdef TTYM_SGR
-                       if (extra >= 277
-# ifdef TTYM_URXVT
-                               && ttym_flags != TTYM_URXVT
-# endif
-                               )
-                           set_option_value((char_u *)"ttym", 0L,
+                           if (extra >= 277)
+                               set_option_value((char_u *)"ttym", 0L,
                                                          (char_u *)"sgr", 0);
-                        else
-# endif
-                       /* if xterm version >= 95 use mouse dragging */
-                       if (extra >= 95
-# ifdef TTYM_URXVT
-                               && ttym_flags != TTYM_URXVT
+                           else
 # endif
-                               )
-                           set_option_value((char_u *)"ttym", 0L,
+                           /* if xterm version >= 95 use mouse dragging */
+                           if (extra >= 95)
+                               set_option_value((char_u *)"ttym", 0L,
                                                       (char_u *)"xterm2", 0);
+                       }
+
                        /* if xterm version >= 141 try to get termcap codes */
                        if (extra >= 141)
                        {

diff --git a/src/version.c b/src/version.c
index 6613e50daaf500a398f17559d1620c8cff2d6e57..e0404d0b3236994c26064ddac8e1b439297b8b9d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    699,
 /**/
     698,
 /**/