diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-22 21:22:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-22 21:22:19 +0200 |
| commit | cbc17d66be624d911354ef7a6f18a9c903e80731 (patch) | |
| tree | 3516a48f76f10fce197dd596f10a36d0b85964b9 | |
| parent | 9a665ba296bfe0e96d9f72d9f50b956e210e50c2 (diff) | |
| download | vim-git-cbc17d66be624d911354ef7a6f18a9c903e80731.tar.gz | |
updated for version 7.4.307v7.4.307
Problem: Can't build without the +termresponse feature.
Solution: Add proper #ifdefs.
| -rw-r--r-- | src/os_unix.c | 15 | ||||
| -rw-r--r-- | src/term.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 10 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 78e9914b1..db64fb45f 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3743,7 +3743,10 @@ check_mouse_termcode() /* Conflicts with xterm mouse: "\033[" and "\033[M". * Also conflicts with the xterm termresponse, skip this if it was * requested already. */ - if (!use_xterm_mouse() && !did_request_esc_sequence() + if (!use_xterm_mouse() +# ifdef FEAT_TERMRESPONSE + && !did_request_esc_sequence() +# endif # ifdef FEAT_GUI && !gui.in_use # endif @@ -3758,7 +3761,10 @@ check_mouse_termcode() # endif # ifdef FEAT_MOUSE_PTERM /* same as the dec mouse */ - if (!use_xterm_mouse() && !did_request_esc_sequence() + if (!use_xterm_mouse() +# ifdef FEAT_TERMRESPONSE + && !did_request_esc_sequence() +# endif # ifdef FEAT_GUI && !gui.in_use # endif @@ -3773,7 +3779,10 @@ check_mouse_termcode() # endif # ifdef FEAT_MOUSE_URXVT /* same as the dec mouse */ - if (use_xterm_mouse() == 3 && !did_request_esc_sequence() + if (use_xterm_mouse() == 3 +# ifdef FEAT_TERMRESPONSE + && !did_request_esc_sequence() +# endif # ifdef FEAT_GUI && !gui.in_use # endif diff --git a/src/term.c b/src/term.c index 5251d6b9a..bd5442120 100644 --- a/src/term.c +++ b/src/term.c @@ -3311,7 +3311,8 @@ stoptermcap() } } -#if defined(UNIX) || defined(PROTO) +#if defined(FEAT_TERMRESPONSE) || defined(PROTO) +# if defined(UNIX) || defined(PROTO) /* * Return TRUE when the xterm version was requested or anything else that * would send an ESC sequence back to Vim. @@ -3327,15 +3328,11 @@ did_request_esc_sequence() if (u7_status == U7_GET) u7_status = 0; return crv_status == CRV_SENT || u7_status == U7_SENT -# if defined(FEAT_TERMRESPONSE) - || xt_index_out > xt_index_in -# endif - ; + || xt_index_out > xt_index_in; } -#endif +# endif -#if defined(FEAT_TERMRESPONSE) || defined(PROTO) /* * Request version string (for xterm) when needed. * Only do this after switching to raw mode, otherwise the result will be diff --git a/src/version.c b/src/version.c index de58cbd7d..41f1b46f2 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 307, +/**/ 306, /**/ 305, |