Permalink
Browse files

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)
  • Loading branch information...
brammool committed Oct 21, 2012
1 parent 35189ed commit 7e45de33f12af875ea95e93077bbb2b7a5d94387
Showing with 14 additions and 14 deletions.
  1. +12 −14 src/term.c
  2. +2 −0 src/version.c
View
@@ -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)
{
View
@@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 699,
/**/
698,
/**/

0 comments on commit 7e45de3

Please sign in to comment.