1 files changed, 25 insertions, 19 deletions

diff --git a/src/nvim/search.c b/src/nvim/search.c
index 23d84038d6..517db05a40 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -96,12 +96,8 @@ static int lastc_bytelen = 1;             // >1 for multi-byte char
 
 // copy of spats[], for keeping the search patterns while executing autocmds
 static struct spat saved_spats[2];
-// copy of spats[RE_SEARCH], for keeping the search patterns while incremental
-// searching
-static struct spat  saved_last_search_spat;
-static int did_save_last_search_spat = 0;
-static int saved_last_idx = 0;
-static bool saved_no_hlsearch = false;
+static int saved_spats_last_idx = 0;
+static bool saved_spats_no_hlsearch = false;
 
 static char_u       *mr_pattern = NULL;    // pattern used by search_regcomp()
 static int mr_pattern_alloced = false;     // mr_pattern was allocated
@@ -268,8 +264,8 @@ void save_search_patterns(void)
     saved_spats[1] = spats[1];
     if (spats[1].pat != NULL)
       saved_spats[1].pat = vim_strsave(spats[1].pat);
-    saved_last_idx = last_idx;
-    saved_no_hlsearch = no_hlsearch;
+    saved_spats_last_idx = last_idx;
+    saved_spats_no_hlsearch = no_hlsearch;
   }
 }
 
@@ -281,8 +277,8 @@ void restore_search_patterns(void)
     set_vv_searchforward();
     free_spat(&spats[1]);
     spats[1] = saved_spats[1];
-    last_idx = saved_last_idx;
-    set_no_hlsearch(saved_no_hlsearch);
+    last_idx = saved_spats_last_idx;
+    set_no_hlsearch(saved_spats_no_hlsearch);
   }
 }
 
@@ -309,6 +305,13 @@ void free_search_patterns(void)
 
 #endif
 
+// copy of spats[RE_SEARCH], for keeping the search patterns while incremental
+// searching
+static struct spat saved_last_search_spat;
+static int did_save_last_search_spat = 0;
+static int saved_last_idx = 0;
+static bool saved_no_hlsearch = false;
+
 /// Save and restore the search pattern for incremental highlight search
 /// feature.
 ///
@@ -317,10 +320,9 @@ void free_search_patterns(void)
 /// cancelling incremental searching even if it's called inside user functions.
 void save_last_search_pattern(void)
 {
-  if (did_save_last_search_spat != 0) {
-    IEMSG("did_save_last_search_spat is not zero");
-  } else {
-    did_save_last_search_spat++;
+  if (++did_save_last_search_spat != 1) {
+    // nested call, nothing to do
+    return;
   }
 
   saved_last_search_spat = spats[RE_SEARCH];
@@ -333,11 +335,15 @@ void save_last_search_pattern(void)
 
 void restore_last_search_pattern(void)
 {
-  if (did_save_last_search_spat != 1) {
-    IEMSG("did_save_last_search_spat is not one");
+  if (--did_save_last_search_spat > 0) {
+    // nested call, nothing to do
+    return;
+  }
+  if (did_save_last_search_spat != 0) {
+    iemsg("restore_last_search_pattern() called more often than"
+          " save_last_search_pattern()");
     return;
   }
-  did_save_last_search_spat--;
 
   xfree(spats[RE_SEARCH].pat);
   spats[RE_SEARCH] = saved_last_search_spat;
@@ -488,7 +494,7 @@ void set_last_search_pat(const char_u *s, int idx, int magic, int setlast)
       saved_spats[idx].pat = NULL;
     else
       saved_spats[idx].pat = vim_strsave(spats[idx].pat);
-    saved_last_idx = last_idx;
+    saved_spats_last_idx = last_idx;
   }
   /* If 'hlsearch' set and search pat changed: need redraw. */
   if (p_hls && idx == last_idx && !no_hlsearch)
@@ -1179,7 +1185,7 @@ int do_search(
       }
 
       if (*searchstr == NUL) {
-        p = spats[last_idx].pat;
+        p = spats[0].pat;
       } else {
         p = searchstr;
       }