Mercurial > vim
changeset 3885:4ffb6f9b58e0 v7.3.699
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)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 21 Oct 2012 02:10:24 +0200 |
| parents | 1418104f039a |
| children | 7495d39f4672 |
| files | src/term.c src/version.c |
| diffstat | 2 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/term.c +++ b/src/term.c @@ -4079,24 +4079,22 @@ check_termcode(max_offset, buf, bufsize, 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 + else # endif - /* if xterm version >= 95 use mouse dragging */ - if (extra >= 95 -# ifdef TTYM_URXVT - && ttym_flags != TTYM_URXVT -# 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) {