aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

updated for version 7.4.307

Browse Source 
Problem:    Can't build without the +termresponse feature.
Solution:   Add proper #ifdefs.
This commit is contained in:
Bram Moolenaar
2014-05-22 21:22:19 +02:00
parent 9a665ba296
commit cbc17d66be
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/os_unix.c
View File

@@ -3743,7 +3743,10 @@ check_mouse_termcode()
/* Conflicts with xterm mouse: "\033[" and "\033[M". /* Conflicts with xterm mouse: "\033[" and "\033[M".
* Also conflicts with the xterm termresponse, skip this if it was * Also conflicts with the xterm termresponse, skip this if it was
* requested already. */ * 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 # ifdef FEAT_GUI
&& !gui.in_use && !gui.in_use
# endif # endif
@@ -3758,7 +3761,10 @@ check_mouse_termcode()
# endif # endif
# ifdef FEAT_MOUSE_PTERM # ifdef FEAT_MOUSE_PTERM
/* same as the dec mouse */ /* 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 # ifdef FEAT_GUI
&& !gui.in_use && !gui.in_use
# endif # endif
@@ -3773,7 +3779,10 @@ check_mouse_termcode()
# endif # endif
# ifdef FEAT_MOUSE_URXVT # ifdef FEAT_MOUSE_URXVT
/* same as the dec mouse */ /* 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 # ifdef FEAT_GUI
&& !gui.in_use && !gui.in_use
# endif # endif

7
src/term.c
View File

@@ -3311,6 +3311,7 @@ stoptermcap()
} }
} }
#if defined(FEAT_TERMRESPONSE) || defined(PROTO)
# if defined(UNIX) || defined(PROTO) # if defined(UNIX) || defined(PROTO)
/* /*
* Return TRUE when the xterm version was requested or anything else that * Return TRUE when the xterm version was requested or anything else that
@@ -3327,15 +3328,11 @@ did_request_esc_sequence()
if (u7_status == U7_GET) if (u7_status == U7_GET)
u7_status = 0; u7_status = 0;
return crv_status == CRV_SENT || u7_status == U7_SENT return crv_status == CRV_SENT || u7_status == U7_SENT
# if defined(FEAT_TERMRESPONSE) || xt_index_out > xt_index_in;
|| xt_index_out > xt_index_in
# endif
;
} }
# endif # endif
#if defined(FEAT_TERMRESPONSE) || defined(PROTO)
/* /*
* Request version string (for xterm) when needed. * Request version string (for xterm) when needed.
* Only do this after switching to raw mode, otherwise the result will be * Only do this after switching to raw mode, otherwise the result will be

2
src/version.c
View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
307,
/**/ /**/
306, 306,
/**/ /**/