astepano / rpms / vim

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