Permalink
Browse files

updated for version 7.4.110

Problem:    "gUgn" cannot be repeeated. (Dimitar Dimitrov)
Solution:   Don't put "gn" in a different order in the redo buffer.  Restore
            'wrapscan' when the pattern isn't found. (Christian Wellenbrock)
  • Loading branch information...
1 parent b95186f commit ba2d44f33863e115b1858ab572829f403ad21883 @brammool brammool committed Nov 28, 2013
Showing with 10 additions and 9 deletions.
  1. +4 −8 src/normal.c
  2. +4 −1 src/search.c
  3. +2 −0 src/version.c
View
@@ -962,11 +962,8 @@ normal_cmd(oap, toplevel)
#ifdef FEAT_CMDL_INFO
need_flushbuf |= add_to_showcmd(ca.nchar);
#endif
- /* For "gn" from redo, need to get one more char to determine the
- * operator */
if (ca.nchar == 'r' || ca.nchar == '\'' || ca.nchar == '`'
- || ca.nchar == Ctrl_BSL
- || ((ca.nchar == 'n' || ca.nchar == 'N') && !stuff_empty()))
+ || ca.nchar == Ctrl_BSL)
{
cp = &ca.extra_char; /* need to get a third character */
if (ca.nchar != 'r')
@@ -1797,10 +1794,9 @@ do_pending_operator(cap, old_col, gui_yank)
* otherwise it might be the second char of the operator. */
if (cap->cmdchar == 'g' && (cap->nchar == 'n'
|| cap->nchar == 'N'))
- /* "gn" and "gN" are a bit different */
- prep_redo(oap->regname, 0L, NUL, cap->cmdchar, cap->nchar,
- get_op_char(oap->op_type),
- get_extra_op_char(oap->op_type));
+ prep_redo(oap->regname, cap->count0,
+ get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
+ oap->motion_force, cap->cmdchar, cap->nchar);
else if (cap->cmdchar != ':')
prep_redo(oap->regname, 0L, NUL, 'v',
get_op_char(oap->op_type),
View
@@ -4544,7 +4544,10 @@ current_search(count, forward)
/* Is the pattern is zero-width? */
one_char = is_one_char(spats[last_idx].pat);
if (one_char == -1)
- return FAIL; /* invalid pattern */
+ {
+ p_ws = old_p_ws;
+ return FAIL; /* pattern not found */
+ }
/*
* The trick is to first search backwards and then search forward again,
View
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 110,
+/**/
109,
/**/
108,

0 comments on commit ba2d44f

Please sign in to comment.