Fix broken meta keys screwing up previous answer, fix misplaced (?) #endif in nanogetstr

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1342 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/search.c b/search.c
index 96111634f81512aa6f4403ddae5253e7edf3058a..86a772aa1cb5d01d700b83a50f66d821ea6ddefc 100644 (file)
--- a/search.c
+++ b/search.c
@@ -111,14 +111,10 @@ int search_init(int replacing)
     search_init_globals();
 
     if (backupstring == NULL)
-#ifndef NANO_SMALL
-       backupstring = mallocstrcpy(backupstring, search_history.current->data);
-#else
-       backupstring = mallocstrcpy(backupstring, last_search);
-#endif
+       backupstring = mallocstrcpy(backupstring, "");
 
 /* NEW TEST */
-    backupstring = mallocstrcpy(backupstring, "");
+
 #ifndef NANO_SMALL
     search_history.current = (historytype *)&search_history.next;
 #endif

diff --git a/winio.c b/winio.c
index c94a62c0d16fc299fdf9f3bca29f041ec4ad2e41..b0b9fb4eff12e9fef513c14ea2f7588192a25c78 100644 (file)
--- a/winio.c
+++ b/winio.c
@@ -369,8 +369,8 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
                }
                x = xend;
            }
-           break;
 #endif
+           break;
        case KEY_DOWN:
 #ifndef NANO_SMALL
            if (history_list) {