diff options
| -rw-r--r-- | CHANGES | 9 | ||||
| -rw-r--r-- | WWW/Library/Implementation/SGML.c | 2 | ||||
| -rw-r--r-- | src/GridText.c | 12 | ||||
| -rw-r--r-- | src/LYReadCFG.c | 2 | ||||
| -rw-r--r-- | userdefs.h | 4 |
5 files changed, 20 insertions, 9 deletions
diff --git a/CHANGES b/CHANGES index 413f0fbd..8fec3409 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,15 @@ Changes since Lynx 2.8 release =============================================================================== +2001-07-10 (2.8.4pre.4) +* correct red/blue color swapping for PDCurses when built on Unix, which uses + X11 -TD +* correct order of checks for wrapping in www_search_forward() and + www_search_backward(), which would allow an infinite loop if there were no + anchors on the current page (report by Frederic L W Meunier) -TD +* add a missing chunk to reverted change of SGML_character() + -nsh@horae.dti.ne.jp + 2001-07-07 (2.8.4pre.3) * review/add descriptions of new command-line options in lynx.man, lynx.hlp and Lynx_users_guide.html -TD diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 8b5eb2e0..6497f8ea 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -3649,6 +3649,8 @@ top1: break; case S_equals: /* After attr = */ + if (WHITE(c)) + break; /* Before attribute value */ if (c == '>') { /* End of tag */ CTRACE((tfp, "SGML: found = but no value\n")); #ifdef USE_PRETTYSRC 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. diff --git a/userdefs.h b/userdefs.h index f64365ca..de4fa879 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1351,11 +1351,11 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.4pre.3" +#define LYNX_VERSION "2.8.4pre.4" #define LYNX_WWW_HOME "http://lynx.browser.org/" #define LYNX_WWW_DIST "http://lynx.isc.org/current/" /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Sat, 07 Jul 2001 18:30:13 -0700" +#define LYNX_DATE "Tue, 10 Jul 2001 10:05:58 -0700" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |