forked from aniani/vim
updated for version 7.4.307
Problem: Can't build without the +termresponse feature. Solution: Add proper #ifdefs.
This commit is contained in:
@@ -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
|
||||
|
11
src/term.c
11
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
|
||||
|
@@ -734,6 +734,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
307,
|
||||
/**/
|
||||
306,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user