|
 |
073263 |
To: vim_dev@googlegroups.com
|
|
|
073263 |
Subject: Patch 7.4.468
|
|
|
073263 |
Fcc: outbox
|
|
|
073263 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
073263 |
Mime-Version: 1.0
|
|
|
073263 |
Content-Type: text/plain; charset=UTF-8
|
|
|
073263 |
Content-Transfer-Encoding: 8bit
|
|
|
073263 |
------------
|
|
|
073263 |
|
|
|
073263 |
Patch 7.4.468
|
|
|
073263 |
Problem: Issue 26: CTRL-C does not interrupt after it was mapped and then
|
|
|
073263 |
unmapped.
|
|
|
073263 |
Solution: Reset mapped_ctrl_c. (Christian Brabandt)
|
|
|
073263 |
Files: src/getchar.c
|
|
|
073263 |
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.467/src/getchar.c 2014-07-30 16:00:45.539553496 +0200
|
|
|
073263 |
--- src/getchar.c 2014-10-09 13:34:09.988888496 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 3707,3712 ****
|
|
|
073263 |
--- 3707,3715 ----
|
|
|
073263 |
{
|
|
|
073263 |
if (!did_it)
|
|
|
073263 |
retval = 2; /* no match */
|
|
|
073263 |
+ else if (*keys == Ctrl_C)
|
|
|
073263 |
+ /* If CTRL-C has been unmapped, reuse it for Interrupting. */
|
|
|
073263 |
+ mapped_ctrl_c = FALSE;
|
|
|
073263 |
goto theend;
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
***************
|
|
|
073263 |
*** 3739,3745 ****
|
|
|
073263 |
goto theend;
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
! /* If CTRL-C has been mapped, don't always use it for Interrupting */
|
|
|
073263 |
if (*keys == Ctrl_C)
|
|
|
073263 |
mapped_ctrl_c = TRUE;
|
|
|
073263 |
|
|
|
073263 |
--- 3742,3748 ----
|
|
|
073263 |
goto theend;
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
! /* If CTRL-C has been mapped, don't always use it for Interrupting. */
|
|
|
073263 |
if (*keys == Ctrl_C)
|
|
|
073263 |
mapped_ctrl_c = TRUE;
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.467/src/version.c 2014-10-09 13:22:41.808886993 +0200
|
|
|
073263 |
--- src/version.c 2014-10-09 13:29:56.252887942 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 743,744 ****
|
|
|
073263 |
--- 743,746 ----
|
|
|
073263 |
{ /* Add new patch number below this line */
|
|
|
073263 |
+ /**/
|
|
|
073263 |
+ 468,
|
|
|
073263 |
/**/
|
|
|
073263 |
|
|
|
073263 |
--
|
|
|
073263 |
Marriage isn't a word. It's a sentence.
|
|
|
073263 |
|
|
|
073263 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
073263 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
073263 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
073263 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|