Viewer doesn't show search error messages

[mooffie]

For example, when searching (F7) using an invalid regexp pattern (say "*" or "["), we aren't shown an appropriate error message telling us the pattern is bad. The editor does show such error messages.

(The only "error" message the viewer shows is "Search string not found".)

[mooffie]

NOTE: to understand the patch, you need to read the documentation for mc_search_run()'s return value, in #3693.

[mooffie]

Explanation for the patch:

The main problem(s) are in mcview_do_search().

mcview_do_search() has the following structure:

{
  boolean found = mcview_find();

  if (orig_search_start != 0 && !found) {
    if (query("Continue from beginning?"))
      search from beginning
  }

  if (!found
        && (view->search->error == MC_SEARCH_E_ABORT
             || view->search->error == MC_SEARCH_E_NOTFOUND))
  {
    ...
    display error message
  }
}

There are two bugs here:

(1) The test view->search->error == MC_SEARCH_E_ABORT || view->search->error == MC_SEARCH_E_NOTFOUND checks for only two of the three possibilities of the failure of mc_search_run(), as documented in the patch at #3693. This test precludes other error codes, like invalid pattern. The fix is simply to remove this test altogether.

(2) We start a "Continue from beginning?"-search even if the failure was because of pattern error or user abort. Instead, we should do this only if the failure was of the MC_SEARCH_E_NOTFOUND kind. Otherwise, besides doing the wrong thing, we also may obliterate a useful error message.

There's also a bug in the backwards search, in mcview_find():

mcview_find() works as follows:

while (we're past the beginning) {

  go backwards a bit

  bolean ok = mc_search_run()

  if (ok)
    return TRUE;

  /* Abort search. */
  if (!ok && view->search->error == MC_SEARCH_E_ABORT)
    return FALSE;
}

return FALSE;

(3) The "abort" should occur for any error other than MC_SEARCH_E_NOTFOUND, not just for interactive user abort.

(BTW, a similar bug perhaps exists in the backwards search in the editor. I'll check this out and start a new ticket if that's the case.)

[andrew_b]

Branch: 3720_mcview_search_error_messages
changeset:46f01d70b234a35c2f3f373ffd7ef7f6bce34121

[andrew_b]

Merged to master: [da538f0b9914bff1e30a9914fbee61f2721708a8].