From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 25 Feb 2011 17:38:36 +0000 (+0100)
Subject: updated for version 7.3.135
X-Git-Tag: v7.3.135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4b0a08c817309e90f467f727947a024c47183ea;p=vim

updated for version 7.3.135
Problem:    When there is no previous substitute pattern, the previous search
            pattern is used.  The other way around doesn't work.
Solution:   When there is no previous search pattern, use the previous
            substitute pattern if possible. (Christian Brabandt)
---

diff --git a/src/search.c b/src/search.c
index 1c971ffda..fc820b908 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1161,12 +1161,20 @@ do_search(oap, dirc, pat, count, options, tm)
 	{
 	    if (spats[RE_SEARCH].pat == NULL)	    /* no previous pattern */
 	    {
-		EMSG(_(e_noprevre));
-		retval = 0;
-		goto end_do_search;
+		pat = spats[RE_SUBST].pat;
+		if (pat == NULL)
+		{
+		    EMSG(_(e_noprevre));
+		    retval = 0;
+		    goto end_do_search;
+		}
+		searchstr = pat;
+	    }
+	    else
+	    {
+		/* make search_regcomp() use spats[RE_SEARCH].pat */
+		searchstr = (char_u *)"";
 	    }
-	    /* make search_regcomp() use spats[RE_SEARCH].pat */
-	    searchstr = (char_u *)"";
 	}
 
 	if (pat != NULL && *pat != NUL)	/* look for (new) offset */
@@ -4527,7 +4535,7 @@ linewhite(lnum)
 #if defined(FEAT_FIND_ID) || defined(PROTO)
 /*
  * Find identifiers or defines in included files.
- * if p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase.
+ * If p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase.
  */
     void
 find_pattern_in_path(ptr, dir, len, whole, skip_comments,
diff --git a/src/version.c b/src/version.c
index 163bf295b..a05dc15bf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    135,
 /**/
     134,
 /**/