From 3c7cb4bbcd56c17e1abba05f20d001a2484d9919 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Fri, 21 Aug 1998 13:30:00 -0400 Subject: snapshot of project "lynx", label v2-8-1dev_22 --- src/LYMainLoop.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'src/LYMainLoop.c') diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index a310b5a4..243bf25d 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -510,18 +510,17 @@ try_again: display_partial = display_partial_flag; /* restore */ Newline_partial = newdoc.line; /* initialize */ NumOfLines_partial = 0; /* initialize */ - /* - * Disable display_partial if requested URL has #fragment. - * Otherwise user got the new document from the first page and - * be moved to #fragment later after download completed, but - * only if user did not mess screen up by scrolling before... - * So fall down to old behavior here. - */ - if (display_partial && LYCursesON && - (strchr(newdoc.address, '#')==NULL)) - display_partial = TRUE; - else + if (display_partial) { + /* + * Disable display_partial if requested URL has #fragment. + * Otherwise user got the new document from the first page + * and be moved to #fragment later after download + * completed, but only if user did not mess screen up by + * scrolling before... So fall down to old behavior here. + */ + if (!LYCursesON || (strchr(newdoc.address, '#'))) display_partial = FALSE; + } #endif /* DISP_PARTIAL */ #ifndef DONT_TRACK_INTERNAL_LINKS @@ -2069,7 +2068,7 @@ new_cmd: /* reloading = TRUE; break; - case LYK_HISTORICAL: + case LYK_HISTORICAL: /* toggle 'historical' comments parsing */ /* * Check if this is a reply from a POST, and if so, * seek confirmation of reload if the safe element @@ -2098,7 +2097,7 @@ new_cmd: /* } break; - case LYK_MINIMAL: + case LYK_MINIMAL: /* toggle 'minimal' comments parsing */ if (!historical_comments) { /* * Check if this is a reply from a POST, and if so, @@ -4970,6 +4969,9 @@ check_add_bookmark_to_self: HTInfoMsg(CANCELLED); break; } + /* + * OK, we download from history page, restore URL from stack. + */ StrAllocCopy(newdoc.address, history[number].address); StrAllocCopy(newdoc.title, links[curdoc.link].hightext); StrAllocCopy(newdoc.bookmark, history[number].bookmark); @@ -4984,6 +4986,7 @@ check_add_bookmark_to_self: newdoc.isHEAD = history[number].isHEAD; newdoc.safe = history[number].safe; newdoc.internal_link = FALSE; + newdoc.line = curdoc.line; /* need for display_partial ! */ newdoc.link = 0; HTOutputFormat = HTAtom_for("www/download"); LYUserSpecifiedURL = TRUE; @@ -5043,7 +5046,7 @@ check_add_bookmark_to_self: newdoc.safe = FALSE; } newdoc.internal_link = FALSE; - newdoc.line = curdoc.line; /* used for display_partial ! */ + newdoc.line = curdoc.line; /* need for display_partial ! */ newdoc.link = 0; HTOutputFormat = HTAtom_for("www/download"); /* -- cgit 1.4.1-2-gfad0 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84