|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.307
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.307 (after 7.4.305)
|
|
|
d6ba96 |
Problem: Can't build without the +termresponse feature.
|
|
|
d6ba96 |
Solution: Add proper #ifdefs.
|
|
|
d6ba96 |
Files: src/os_unix.c, src/term.c
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.306/src/os_unix.c 2014-05-22 18:14:27.570224664 +0200
|
|
|
d6ba96 |
--- src/os_unix.c 2014-05-22 20:29:36.930059845 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 3743,3749 ****
|
|
|
d6ba96 |
/* Conflicts with xterm mouse: "\033[" and "\033[M".
|
|
|
d6ba96 |
* Also conflicts with the xterm termresponse, skip this if it was
|
|
|
d6ba96 |
* requested already. */
|
|
|
d6ba96 |
! if (!use_xterm_mouse() && !did_request_esc_sequence()
|
|
|
d6ba96 |
# ifdef FEAT_GUI
|
|
|
d6ba96 |
&& !gui.in_use
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
--- 3743,3752 ----
|
|
|
d6ba96 |
/* Conflicts with xterm mouse: "\033[" and "\033[M".
|
|
|
d6ba96 |
* Also conflicts with the xterm termresponse, skip this if it was
|
|
|
d6ba96 |
* requested already. */
|
|
|
d6ba96 |
! if (!use_xterm_mouse()
|
|
|
d6ba96 |
! # ifdef FEAT_TERMRESPONSE
|
|
|
d6ba96 |
! && !did_request_esc_sequence()
|
|
|
d6ba96 |
! # endif
|
|
|
d6ba96 |
# ifdef FEAT_GUI
|
|
|
d6ba96 |
&& !gui.in_use
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 3758,3764 ****
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
# ifdef FEAT_MOUSE_PTERM
|
|
|
d6ba96 |
/* same as the dec mouse */
|
|
|
d6ba96 |
! if (!use_xterm_mouse() && !did_request_esc_sequence()
|
|
|
d6ba96 |
# ifdef FEAT_GUI
|
|
|
d6ba96 |
&& !gui.in_use
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
--- 3761,3770 ----
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
# ifdef FEAT_MOUSE_PTERM
|
|
|
d6ba96 |
/* same as the dec mouse */
|
|
|
d6ba96 |
! if (!use_xterm_mouse()
|
|
|
d6ba96 |
! # ifdef FEAT_TERMRESPONSE
|
|
|
d6ba96 |
! && !did_request_esc_sequence()
|
|
|
d6ba96 |
! # endif
|
|
|
d6ba96 |
# ifdef FEAT_GUI
|
|
|
d6ba96 |
&& !gui.in_use
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 3773,3779 ****
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
# ifdef FEAT_MOUSE_URXVT
|
|
|
d6ba96 |
/* same as the dec mouse */
|
|
|
d6ba96 |
! if (use_xterm_mouse() == 3 && !did_request_esc_sequence()
|
|
|
d6ba96 |
# ifdef FEAT_GUI
|
|
|
d6ba96 |
&& !gui.in_use
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
--- 3779,3788 ----
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
# ifdef FEAT_MOUSE_URXVT
|
|
|
d6ba96 |
/* same as the dec mouse */
|
|
|
d6ba96 |
! if (use_xterm_mouse() == 3
|
|
|
d6ba96 |
! # ifdef FEAT_TERMRESPONSE
|
|
|
d6ba96 |
! && !did_request_esc_sequence()
|
|
|
d6ba96 |
! # endif
|
|
|
d6ba96 |
# ifdef FEAT_GUI
|
|
|
d6ba96 |
&& !gui.in_use
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
*** ../vim-7.4.306/src/term.c 2014-05-22 18:14:27.570224664 +0200
|
|
|
d6ba96 |
--- src/term.c 2014-05-22 20:28:34.922061106 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 3311,3317 ****
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
|
|
|
d6ba96 |
! #if defined(UNIX) || defined(PROTO)
|
|
|
d6ba96 |
/*
|
|
|
d6ba96 |
* Return TRUE when the xterm version was requested or anything else that
|
|
|
d6ba96 |
* would send an ESC sequence back to Vim.
|
|
|
d6ba96 |
--- 3311,3318 ----
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
|
|
|
d6ba96 |
! #if defined(FEAT_TERMRESPONSE) || defined(PROTO)
|
|
|
d6ba96 |
! # if defined(UNIX) || defined(PROTO)
|
|
|
d6ba96 |
/*
|
|
|
d6ba96 |
* Return TRUE when the xterm version was requested or anything else that
|
|
|
d6ba96 |
* would send an ESC sequence back to Vim.
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 3327,3341 ****
|
|
|
d6ba96 |
if (u7_status == U7_GET)
|
|
|
d6ba96 |
u7_status = 0;
|
|
|
d6ba96 |
return crv_status == CRV_SENT || u7_status == U7_SENT
|
|
|
d6ba96 |
! # if defined(FEAT_TERMRESPONSE)
|
|
|
d6ba96 |
! || xt_index_out > xt_index_in
|
|
|
d6ba96 |
! # endif
|
|
|
d6ba96 |
! ;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
! #endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
- #if defined(FEAT_TERMRESPONSE) || defined(PROTO)
|
|
|
d6ba96 |
/*
|
|
|
d6ba96 |
* Request version string (for xterm) when needed.
|
|
|
d6ba96 |
* Only do this after switching to raw mode, otherwise the result will be
|
|
|
d6ba96 |
--- 3328,3338 ----
|
|
|
d6ba96 |
if (u7_status == U7_GET)
|
|
|
d6ba96 |
u7_status = 0;
|
|
|
d6ba96 |
return crv_status == CRV_SENT || u7_status == U7_SENT
|
|
|
d6ba96 |
! || xt_index_out > xt_index_in;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
! # endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/*
|
|
|
d6ba96 |
* Request version string (for xterm) when needed.
|
|
|
d6ba96 |
* Only do this after switching to raw mode, otherwise the result will be
|
|
|
d6ba96 |
*** ../vim-7.4.306/src/version.c 2014-05-22 18:59:54.510169240 +0200
|
|
|
d6ba96 |
--- src/version.c 2014-05-22 21:20:36.665997658 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 736,737 ****
|
|
|
d6ba96 |
--- 736,739 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 307,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
Some of the well known MS-Windows errors:
|
|
|
d6ba96 |
ESLEEP Operator fell asleep
|
|
|
d6ba96 |
ENOERR No error yet
|
|
|
d6ba96 |
EDOLLAR OS too expensive
|
|
|
d6ba96 |
EWINDOWS MS-Windows loaded, system in danger
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|