lynx-dev dev21 form-based options patch

[Leonid Pauzner]

There was a problem with options menu:
postoptions() return the form-based menu, not the previous document,
so we made a dirty fix in mainloop (see below)
without understanding the subject.

To reduce this clutter the patch proposed:



diff -u ..\old/lymainlo.c ./lymainlo.c
--- ..\old/lymainlo.c  Tue Aug 18 15:59:42 1998
+++ ./lymainlo.c        Thu Aug 20 22:06:18 1998
@@ -376,15 +376,7 @@
                     *  elements to the curdoc structure elements
                     *  under case NORMAL.  - FM
                     */
-#ifndef EXP_FORMS_OPTIONS
                    if (strncmp(newdoc.address, "LYNXDOWNLOAD:", 13))
-#else /* EXP_FORMS_OPTIONS */
-                   if (!strncmp(newdoc.address, "LYNXOPTIONS://MBM_MENU", 22))
-                       LYpush(&curdoc, ForcePush);
-
-                   if (strncmp(newdoc.address, "LYNXDOWNLOAD:", 13) &&
-                       strncmp(newdoc.address, "LYNXOPTIONS:", 12))
-#endif /* EXP_FORMS_OPTIONS */
                    {
                        LYpush(&curdoc, ForcePush);
                    }
@@ -3859,7 +3851,7 @@
                FREE(newdoc.bookmark);
                newdoc.isHEAD = FALSE;
                newdoc.safe = FALSE;
-               ForcePush = TRUE;
+               ForcePush = FALSE; /* push document as usual */
                if (check_realm)
                    LYPermitURL = TRUE;
                refresh_screen = TRUE;  /* redisplay */
diff -u ..\old/lyoption.c ./lyoption.c
--- ..\old/lyoption.c  Sun Aug 16 16:39:18 1998
+++ ./lyoption.c        Thu Aug 20 22:06:22 1998
@@ -3564,6 +3564,7 @@
     if (need_reload == TRUE)  {
         /* FIXME: currently dummy */
     }
+    LYpop(newdoc); /* return to previous doc, not in options menu */
     return(NULLFILE);
 }