jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.571

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