|
Karsten Hopp |
cb397d |
To: vim_dev@googlegroups.com
|
|
Karsten Hopp |
cb397d |
Subject: Patch 7.4.571
|
|
Karsten Hopp |
cb397d |
Fcc: outbox
|
|
Karsten Hopp |
cb397d |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
Karsten Hopp |
cb397d |
Mime-Version: 1.0
|
|
Karsten Hopp |
cb397d |
Content-Type: text/plain; charset=UTF-8
|
|
Karsten Hopp |
cb397d |
Content-Transfer-Encoding: 8bit
|
|
Karsten Hopp |
cb397d |
------------
|
|
Karsten Hopp |
cb397d |
|
|
Karsten Hopp |
cb397d |
Patch 7.4.571 (after 7.4.569)
|
|
Karsten Hopp |
cb397d |
Problem: Can't build with tiny features. (Ike Devolder)
|
|
Karsten Hopp |
cb397d |
Solution: Add #ifdef.
|
|
Karsten Hopp |
cb397d |
Files: src/getchar.c
|
|
Karsten Hopp |
cb397d |
|
|
Karsten Hopp |
cb397d |
|
|
Karsten Hopp |
cb397d |
*** ../vim-7.4.570/src/getchar.c 2015-01-14 12:44:38.403422124 +0100
|
|
Karsten Hopp |
cb397d |
--- src/getchar.c 2015-01-14 14:06:14.457992406 +0100
|
|
Karsten Hopp |
cb397d |
***************
|
|
Karsten Hopp |
cb397d |
*** 3710,3718 ****
|
|
Karsten Hopp |
cb397d |
--- 3710,3720 ----
|
|
Karsten Hopp |
cb397d |
else if (*keys == Ctrl_C)
|
|
Karsten Hopp |
cb397d |
{
|
|
Karsten Hopp |
cb397d |
/* If CTRL-C has been unmapped, reuse it for Interrupting. */
|
|
Karsten Hopp |
cb397d |
+ #ifdef FEAT_LOCALMAP
|
|
Karsten Hopp |
cb397d |
if (map_table == curbuf->b_maphash)
|
|
Karsten Hopp |
cb397d |
curbuf->b_mapped_ctrl_c &= ~mode;
|
|
Karsten Hopp |
cb397d |
else
|
|
Karsten Hopp |
cb397d |
+ #endif
|
|
Karsten Hopp |
cb397d |
mapped_ctrl_c &= ~mode;
|
|
Karsten Hopp |
cb397d |
}
|
|
Karsten Hopp |
cb397d |
goto theend;
|
|
Karsten Hopp |
cb397d |
***************
|
|
Karsten Hopp |
cb397d |
*** 3750,3758 ****
|
|
Karsten Hopp |
cb397d |
--- 3752,3762 ----
|
|
Karsten Hopp |
cb397d |
/* If CTRL-C has been mapped, don't always use it for Interrupting. */
|
|
Karsten Hopp |
cb397d |
if (*keys == Ctrl_C)
|
|
Karsten Hopp |
cb397d |
{
|
|
Karsten Hopp |
cb397d |
+ #ifdef FEAT_LOCALMAP
|
|
Karsten Hopp |
cb397d |
if (map_table == curbuf->b_maphash)
|
|
Karsten Hopp |
cb397d |
curbuf->b_mapped_ctrl_c |= mode;
|
|
Karsten Hopp |
cb397d |
else
|
|
Karsten Hopp |
cb397d |
+ #endif
|
|
Karsten Hopp |
cb397d |
mapped_ctrl_c |= mode;
|
|
Karsten Hopp |
cb397d |
}
|
|
Karsten Hopp |
cb397d |
|
|
Karsten Hopp |
cb397d |
*** ../vim-7.4.570/src/version.c 2015-01-14 14:04:05.511397639 +0100
|
|
Karsten Hopp |
cb397d |
--- src/version.c 2015-01-14 14:07:02.889464623 +0100
|
|
Karsten Hopp |
cb397d |
***************
|
|
Karsten Hopp |
cb397d |
*** 743,744 ****
|
|
Karsten Hopp |
cb397d |
--- 743,746 ----
|
|
Karsten Hopp |
cb397d |
{ /* Add new patch number below this line */
|
|
Karsten Hopp |
cb397d |
+ /**/
|
|
Karsten Hopp |
cb397d |
+ 571,
|
|
Karsten Hopp |
cb397d |
/**/
|
|
Karsten Hopp |
cb397d |
|
|
Karsten Hopp |
cb397d |
--
|
|
Karsten Hopp |
cb397d |
hundred-and-one symptoms of being an internet addict:
|
|
Karsten Hopp |
cb397d |
91. It's Saturday afternoon in the middle of May and you
|
|
Karsten Hopp |
cb397d |
are on computer.
|
|
Karsten Hopp |
cb397d |
|
|
Karsten Hopp |
cb397d |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
Karsten Hopp |
cb397d |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
Karsten Hopp |
cb397d |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
Karsten Hopp |
cb397d |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|