aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.699

Browse Source 
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)
This commit is contained in:
Bram Moolenaar 2012-10-21 02:10:24 +02:00
parent 003d14a267
commit bffa06ddb8
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/term.c
View File

@ -4079,24 +4079,22 @@ check_termcode(max_offset, buf, bufsize, buflen)
if (tp[1 + (tp[0] != CSI)] == '>' && j == 2) 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 # ifdef TTYM_SGR
if (extra >= 277 if (extra >= 277)
# ifdef TTYM_URXVT set_option_value((char_u *)"ttym", 0L,
&& ttym_flags != TTYM_URXVT
# endif
)
set_option_value((char_u *)"ttym", 0L,
(char_u *)"sgr", 0); (char_u *)"sgr", 0);
else else
# endif # endif
/* if xterm version >= 95 use mouse dragging */ /* if xterm version >= 95 use mouse dragging */
if (extra >= 95 if (extra >= 95)
# ifdef TTYM_URXVT set_option_value((char_u *)"ttym", 0L,
&& ttym_flags != TTYM_URXVT
# endif
)
set_option_value((char_u *)"ttym", 0L,
(char_u *)"xterm2", 0); (char_u *)"xterm2", 0);
}
/* if xterm version >= 141 try to get termcap codes */ /* if xterm version >= 141 try to get termcap codes */
if (extra >= 141) if (extra >= 141)
{ {

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
699,
/**/ /**/
698, 698,
/**/ /**/