From eb87562f099a5cd051f84a8089e49f512a6cf73b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 02:10:24 +0200
Subject: 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)

---
 src/term.c    | 26 ++++++++++++--------------
 src/version.c |  2 ++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/term.c b/src/term.c
index 38fc89b6..3efa7a7a 100644
--- 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 6613e50d..e0404d0b 100644
--- 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,
 /**/
-- 
cgit v1.2.1