lynx-dev Re: bug (1) fixed - (patch)

[Leonid Pauzner]

> * Restore newline position when return from the Print menu or follow
>   a link from History page (was broken for partial display mode only):
>   LYPop() and LYPop_num now reinitialize Newline_partial if happen on getfile
>   stage. Also remove changes from 1998-06-11 (case LYK_DOWNLOAD)
>   since this now protected by HText_new() which never start for. - LP

slightly more advanced addition (against my previous patch):


diff -u old/lyhistor.c ./lyhistor.c
--- old/lyhistor.c      Sun Oct  4 02:31:08 1998
+++ ./lyhistor.c        Sun Oct  4 15:52:30 1998
@@ -325,6 +325,7 @@
 #ifdef DISP_PARTIAL
        /* assume we pop the 'doc' to show it soon... */
        Newline_partial = doc->line;    /* reinitialize */
+       NumOfLines_partial = -1;        /* initialize to -1 */
 #endif /* DISP_PARTIAL */
        CTRACE(tfp, "LYpop[%d]: address:%s\n     title:%s\n",
                    nhist, doc->address, doc->title);
@@ -354,6 +355,7 @@
 #ifdef DISP_PARTIAL
        /* assume we pop the 'doc' to show it soon... */
        Newline_partial = doc->line;    /* reinitialize */
+       NumOfLines_partial = -1;        /* initialize to -1 */
 #endif /* DISP_PARTIAL */
     }
 }
diff -u old/lymainlo.c ./lymainlo.c
--- old/lymainlo.c      Sun Oct  4 02:28:32 1998
+++ ./lymainlo.c        Sun Oct  4 16:11:08 1998
@@ -505,14 +505,16 @@
                                /* and set the flag to 0  */
                if (display_partial) {
                    /*
-                    * Disable display_partial if requested URL has #fragment.
+                    * Disable display_partial if requested URL has #fragment
+                    * and we are not popped from the history stack
+                    * so can't calculate correct newline position for 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
+                    * completed, but only if s/he did not mess screen up by
                     * scrolling before...  So fall down to old behavior here.
                     */
                    if (!LYCursesON ||
-                               (strchr(newdoc.address, '#')))
+                               (Newline_partial == 1 && strchr(newdoc.address, 
'#')))
                        display_partial = FALSE;
                }
 #endif /* DISP_PARTIAL */