updated for version 7.4.307
Problem: Can't build without the +termresponse feature.
Solution: Add proper #ifdefs.
diff --git a/src/os_unix.c b/src/os_unix.c
index 78e9914..db64fb4 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3743,7 +3743,10 @@
/* 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 @@
# 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 @@
# 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 5251d6b..bd54421 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3311,7 +3311,8 @@
}
}
-#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 @@
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 de58cbd..41f1b46 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 307,
+/**/
306,
/**/
305,