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 78e9914b16cc5a0766452bf5419a4713d730c8b4..db64fb45fb0d913a57d9cd230740df7e93078e7e 100644 (file)
--- 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 5251d6b9a1df411d541399e577d558c0f1b843ba..bd54421202c720a518996a43e591070f11ece8ac 100644 (file)
--- 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 de58cbd7d9bb06f6c0f5b9a3bf8143bf590dc1cb..41f1b46f2e23e1463a0c54c9e9b5d9da0f187f4f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    307,
 /**/
     306,
 /**/