[Lynx-dev] Re: fixs for goto popup and other bugs

[PBM .]

Almost. Forget about that patch it doesnt fix all irritating stuff.
no_entry is now global, better fix would be to rewrite LYgetstr function.

--- lynx2.8.7dev.5a/src/LYGlobalDefs.h       Sat May 26 16:37:20 2007
+++ lynx2.8.7xxx/src/LYGlobalDefs.h  Thu Jun  7 20:13:35 2007
@@ -333,6 +333,7 @@
    extern BOOLEAN no_suspend;
    extern BOOLEAN no_telnet_port;
    extern BOOLEAN no_useragent;
+    extern BOOLEAN no_entry;

    extern BOOLEAN no_statusline;
    extern BOOLEAN no_filereferer;
--- lynx2.8.7dev.5a/src/LYMain.c     Sat May 26 16:37:20 2007
+++ lynx2.8.7xxx/src/LYMain.c        Thu Jun  7 20:16:07 2007
@@ -278,6 +278,7 @@
BOOLEAN no_suspend = FALSE;
BOOLEAN no_telnet_port = FALSE;
BOOLEAN no_useragent = FALSE;
+BOOLEAN no_entry = FALSE;

#ifndef DISABLE_FTP
BOOLEAN ftp_passive = FTP_PASSIVE;     /* TRUE if doing ftp in passive mode */
--- lynx2.8.7dev.5a/src/LYStrings.c  Wed Jun  6 12:40:01 2007
+++ lynx2.8.7xxx/src/LYStrings.c     Thu Jun  7 20:11:41 2007
@@ -3434,6 +3434,7 @@
    char *p = temp;
    int num;

+    no_entry = TRUE;
    /*
     * Load the c argument into the prompt buffer.
     */
@@ -3450,6 +3451,7 @@
       *rel = '\0';
       return (0);
    }
+    no_entry = FALSE;

    *rel = '\0';
    num = atoi(p);
@@ -4086,8 +4088,6 @@
    /*
     * Clear the command line and write the popup statusline.  - FM
     */
-    LYmove((LYlines - 1), 0);
-    LYclrtoeol();
    if (disabled) {
       popup_status_msg = CHOICE_LIST_UNM_MSG;
    } else if (!for_mouse) {
@@ -4944,7 +4942,8 @@
                                                  -1,
                                                  FALSE,
                                                  FALSE,
-                                                  TRUE);
+                                                  (keypad_mode ==
NUMBERS_AS_ARROWS)
+                                                  ? FALSE : TRUE);
                   if (cur_choice >= 0) {
                       if (recall == RECALL_CMD)
                           _statusline(": ");
@@ -4979,7 +4978,7 @@
            * Terminate the string and return.
            */
           LYstrncpy(inputline, MyEdit.buffer, (int) bufsize);
-           if (!hidden)
+           if (!hidden && !no_entry) /* we do not want numbers here */
               LYAddToCloset(recall, MyEdit.buffer);
           CTRACE((tfp, "LYgetstr(%s) LYE_ENTER\n", inputline));
           return (ch);
--- lynx2.8.7dev.5a/src/LYGetFile.c  Mon May 28 23:46:48 2007
+++ lynx2.8.7xxx/src/LYGetFile.c     Thu Jun  7 20:08:32 2007
@@ -1098,9 +1098,6 @@
 * If follow_link_number returns DO_GOTOPAGE_STUFF it has set doc->line to the
 * top line of the desired page for displaying that page.
 *
 * If follow_link_number returns PRINT_ERROR an error message will be given to
 * the user.
 *
@@ -1126,6 +1123,7 @@
    temp[1] = '\0';
    *num = -1;
    _statusline(FOLLOW_LINK_NUMBER);
+    no_entry = TRUE;
    /*
     * Get the number, possibly with a letter suffix, from the user.
     */
@@ -1133,6 +1131,7 @@
       HTInfoMsg(CANCELLED);
       return (DO_NOTHING);
    }
+    no_entry = FALSE;
    *num = atoi(p);
    while (isdigit(UCH(*p)))
       ++p;