From 52b82fac17962f62bfab7dbb43381a6b51d356d9 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Tue, 10 Jul 2001 19:48:01 -0400 Subject: snapshot of project "lynx", label v2-8-4pre_4 --- src/GridText.c | 12 ++++++------ src/LYReadCFG.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/GridText.c b/src/GridText.c index db8c49d1..ce71b632 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -7756,12 +7756,12 @@ PRIVATE int www_search_forward ARGS5( if (LYno_attr_strstr(line->data, target)) { tentative_result = count; break; - } else if (line == HTMainText->last_line) { - count = 0; - wrapped = TRUE; } else if (count == start_line && wrapped) { HTUserMsg2(STRING_NOT_FOUND, target); return -1; + } else if (line == HTMainText->last_line) { + count = 0; + wrapped = TRUE; } line = line->next; count++; @@ -7799,12 +7799,12 @@ PRIVATE int www_search_backward ARGS5( if (LYno_attr_strstr(line->data, target)) { tentative_result = count; break; - } else if (line == FirstHTLine(HTMainText)) { - count = line_num_in_text(HTMainText, LastHTLine(HTMainText)) + 1; - wrapped = TRUE; } else if (count == start_line && wrapped) { HTUserMsg2(STRING_NOT_FOUND, target); return -1; + } else if (line == FirstHTLine(HTMainText)) { + count = line_num_in_text(HTMainText, LastHTLine(HTMainText)) + 1; + wrapped = TRUE; } line = line->prev; count--; diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index bb4f9191..82f4e8ff 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -264,7 +264,7 @@ PRIVATE CONST char *Color_Strings[16] = "white" }; -#if defined(PDCURSES) +#if defined(PDCURSES) && !defined(XCURSES) /* * PDCurses (and possibly some other implementations) use a non-ANSI set of * codes for colors. -- cgit 1.4.1-2-gfad0