From f857959b8eabeda49dee9453347ef2d3f7083fc1 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 25 May 2021 14:37:31 +0200 Subject: [PATCH] startup: suppress "Search Wrapped" when using +? to search from EOF When using +/ or +?, any minor feedback should be cleared, to not distract from the highligted search result. This fixes https://savannah.gnu.org/bugs/?60669. Bug existed since version 5.5, commit b86f7868, since the manner of grading status-bar messages changed. --- src/nano.c | 2 +- src/winio.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nano.c b/src/nano.c index a4a9c3d1..abc49174 100644 --- a/src/nano.c +++ b/src/nano.c @@ -2433,7 +2433,7 @@ int main(int argc, char **argv) if (!findnextstr(searchstring, FALSE, JUSTFIND, NULL, ISSET(BACKWARDS_SEARCH), openfile->filetop, 0)) not_found_msg(searchstring); - else if (lastmessage == HUSH) + else if (lastmessage <= REMARK) wipe_statusbar(); openfile->placewewant = xplustabs(); if (ISSET(USE_REGEXP)) diff --git a/src/winio.c b/src/winio.c index 2121c19c..57e4043a 100644 --- a/src/winio.c +++ b/src/winio.c @@ -1670,6 +1670,7 @@ void wipe_statusbar(void) { blank_row(bottomwin, 0); wnoutrefresh(bottomwin); + lastmessage = VACUUM; } /* Blank out the two help lines (when they are present). */