jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.110
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.110
3ef2ca
Problem:    "gUgn" cannot be repeeated. (Dimitar Dimitrov)
3ef2ca
Solution:   Don't put "gn" in a different order in the redo buffer.  Restore
3ef2ca
	    'wrapscan' when the pattern isn't found. (Christian Wellenbrock)
3ef2ca
Files:	    src/normal.c, src/search.c, src/test53.in, src/test53.ok
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.109/src/normal.c	2013-11-04 01:41:11.000000000 +0100
3ef2ca
--- src/normal.c	2013-11-28 19:02:45.000000000 +0100
3ef2ca
***************
3ef2ca
*** 962,972 ****
3ef2ca
  #ifdef FEAT_CMDL_INFO
3ef2ca
  	    need_flushbuf |= add_to_showcmd(ca.nchar);
3ef2ca
  #endif
3ef2ca
- 	    /* For "gn" from redo, need to get one more char to determine the
3ef2ca
- 	     * operator */
3ef2ca
  	    if (ca.nchar == 'r' || ca.nchar == '\'' || ca.nchar == '`'
3ef2ca
! 						       || ca.nchar == Ctrl_BSL
3ef2ca
! 		  || ((ca.nchar == 'n' || ca.nchar == 'N') && !stuff_empty()))
3ef2ca
  	    {
3ef2ca
  		cp = &ca.extra_char;	/* need to get a third character */
3ef2ca
  		if (ca.nchar != 'r')
3ef2ca
--- 962,969 ----
3ef2ca
  #ifdef FEAT_CMDL_INFO
3ef2ca
  	    need_flushbuf |= add_to_showcmd(ca.nchar);
3ef2ca
  #endif
3ef2ca
  	    if (ca.nchar == 'r' || ca.nchar == '\'' || ca.nchar == '`'
3ef2ca
! 						       || ca.nchar == Ctrl_BSL)
3ef2ca
  	    {
3ef2ca
  		cp = &ca.extra_char;	/* need to get a third character */
3ef2ca
  		if (ca.nchar != 'r')
3ef2ca
***************
3ef2ca
*** 1797,1806 ****
3ef2ca
  		 * otherwise it might be the second char of the operator. */
3ef2ca
  		if (cap->cmdchar == 'g' && (cap->nchar == 'n'
3ef2ca
  							|| cap->nchar == 'N'))
3ef2ca
! 		    /* "gn" and "gN" are a bit different */
3ef2ca
! 		    prep_redo(oap->regname, 0L, NUL, cap->cmdchar, cap->nchar,
3ef2ca
! 					get_op_char(oap->op_type),
3ef2ca
! 					get_extra_op_char(oap->op_type));
3ef2ca
  		else if (cap->cmdchar != ':')
3ef2ca
  		    prep_redo(oap->regname, 0L, NUL, 'v',
3ef2ca
  					get_op_char(oap->op_type),
3ef2ca
--- 1794,1802 ----
3ef2ca
  		 * otherwise it might be the second char of the operator. */
3ef2ca
  		if (cap->cmdchar == 'g' && (cap->nchar == 'n'
3ef2ca
  							|| cap->nchar == 'N'))
3ef2ca
! 		    prep_redo(oap->regname, cap->count0,
3ef2ca
! 			    get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
3ef2ca
! 			    oap->motion_force, cap->cmdchar, cap->nchar);
3ef2ca
  		else if (cap->cmdchar != ':')
3ef2ca
  		    prep_redo(oap->regname, 0L, NUL, 'v',
3ef2ca
  					get_op_char(oap->op_type),
3ef2ca
*** ../vim-7.4.109/src/search.c	2013-11-08 04:30:06.000000000 +0100
3ef2ca
--- src/search.c	2013-11-28 19:05:16.000000000 +0100
3ef2ca
***************
3ef2ca
*** 4544,4550 ****
3ef2ca
      /* Is the pattern is zero-width? */
3ef2ca
      one_char = is_one_char(spats[last_idx].pat);
3ef2ca
      if (one_char == -1)
3ef2ca
! 	return FAIL;  /* invalid pattern */
3ef2ca
  
3ef2ca
      /*
3ef2ca
       * The trick is to first search backwards and then search forward again,
3ef2ca
--- 4544,4553 ----
3ef2ca
      /* Is the pattern is zero-width? */
3ef2ca
      one_char = is_one_char(spats[last_idx].pat);
3ef2ca
      if (one_char == -1)
3ef2ca
!     {
3ef2ca
! 	p_ws = old_p_ws;
3ef2ca
! 	return FAIL;  /* pattern not found */
3ef2ca
!     }
3ef2ca
  
3ef2ca
      /*
3ef2ca
       * The trick is to first search backwards and then search forward again,
3ef2ca
*** ../vim-7.4.109/src/version.c	2013-11-28 18:53:47.000000000 +0100
3ef2ca
--- src/version.c	2013-11-28 19:20:29.000000000 +0100
3ef2ca
***************
3ef2ca
*** 740,741 ****
3ef2ca
--- 740,743 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     110,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
hundred-and-one symptoms of being an internet addict:
3ef2ca
10. And even your night dreams are in HTML.
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    ///