From e1620190f718213ad097defe07540175d02cb917 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Sat, 9 Feb 2019 10:45:50 +0100
Subject: [PATCH] display: ensure that spotlighted text is not treated as a
 prompt answer

When doing replacements or fixing misspelled words, and edit_refresh()
is called to highlight the relevant word, then the current menu can be
anything from MREPLACEWITH, MYESNO, MSPELL, or MMAIN.  Make sure it is
always set to the latter just before calling edit_refresh(), so the
word will be properly highlighted.

This fixes https://savannah.gnu.org/bugs/?55680.
Reported-by: David Lawrence Ramsey <pooka109@gmail.com>

Bug was introduced two days ago, by the previous commit, 56181896.
---
 src/search.c | 1 +
 src/text.c   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/search.c b/src/search.c
index 33ced4c9..5790c265 100644
--- a/src/search.c
+++ b/src/search.c
@@ -579,6 +579,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
 			light_from_col = xplustabs();
 			light_to_col = strnlenpt(openfile->current->data,
 										openfile->current_x + match_len);
+			currmenu = MMAIN;
 
 			/* Refresh the edit window, scrolling it if necessary. */
 			edit_refresh();
diff --git a/src/text.c b/src/text.c
index 5ffdb072..acf0b864 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2202,6 +2202,7 @@ bool fix_spello(const char *word)
 		filestruct *saved_mark = openfile->mark;
 		openfile->mark = NULL;
 #endif
+		currmenu = MMAIN;
 		edit_refresh();
 
 		/* Let the user supply a correctly spelled alternative. */
-- 
2.20.1

