merge in recent changes from main repo

1 files changed, 4 insertions, 4 deletions

diff --git a/src/uicmd.cc b/src/uicmd.cc
index 68550e41..577e2a17 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -1221,14 +1221,14 @@ void a_UIcmd_fullscreen_toggle(BrowserWindow *bw)
  * Search for next/previous occurrence of key.
  */
 void a_UIcmd_findtext_search(BrowserWindow *bw, const char *key,
-                             int case_sens, int backwards)
+                             int case_sens, int backward)
 {
    Layout *l = (Layout *)bw->render_layout;
 
-   switch (l->search(key, case_sens, backwards)) {
+   switch (l->search(key, case_sens, backward)) {
    case FindtextState::RESTART:
-      a_UIcmd_set_msg(bw, "No further occurrences of \"%s\". "
-                          "Restarting from the top.", key);
+      a_UIcmd_set_msg(bw, backward?"Top reached; restarting from the bottom."
+                                  :"Bottom reached; restarting from the top.");
       break;
    case FindtextState::NOT_FOUND:
       a_UIcmd_set_msg(bw, "\"%s\" not found.", key);