Add and fix bugs #63 and 64

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

diff --git a/BUGS b/BUGS
index 0e734079bfb34f561515712bc71f22936fd043fe..8675605096dc6a8c491ed0afaed94745963c0f93 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -117,6 +117,12 @@
 - Blank lines are not kept when cutting with -k (discovered by Rocco)
   (61) [FIXED].
 - Nano will not suspend properly inside of mutt (62) [FIXED].
+- When switching from Pico mode to normal mode, the previous search is
+  not displayed until cancelling the search (63) [FIXED].
+- If you change search options but don't change the search string in
+  normal mode, hitting  enter causes the search/replace to abort (64)
+  (Jordi Mallach) [FIXED].
+
 ** Open BUGS **
 
 $Id$

diff --git a/ChangeLog b/ChangeLog
index f492f71323dd82484839696a8657d13d01dc8251..1b47732094bdd65c4d89c2313c4f69de0a38ba45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 CVS code -
+- General
+       - Added BUGS #63 & 64.  Fixes in search_init() and nanogetstr(),
+         new flag CLEAR_BACKUPSTRING because there's no easy way to
+         clear the backupstring without making it global (messy), so we
+         use a flag instead (just as messy?)
 - files.c:
   do_browser()
        - More Picoish keystrokes for the browser, ^P, ^N, etc, for up,

diff --git a/aclocal.m4 b/aclocal.m4
index efced8455912cf53bcc18bfd061cfea7d8ccef66..be6cea6760044ed7737062b2227208965a95ac68 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p4
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation

diff --git a/config.h.in b/config.h.in
index 0bb4b94db4c4be978d0fd1d1b72f3ba2cbe9cfe0..44792244d832e75c3ecebbea6a07450e9c8034a7 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
 
 /* Define if using alloca.c.  */
 #undef C_ALLOCA

diff --git a/nano.c b/nano.c
index bfe3e0249fc8d4457db649b439074a2f36169845..1802cff5b8572f48f39d905169a7431604d6e248 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -2116,6 +2116,7 @@ void do_toggle(int which)
     switch (toggles[which].val) {
     case TOGGLE_PICOMODE_KEY:
        shortcut_init(0);
+       SET(CLEAR_BACKUPSTRING);
        display_main_list();
        break;
     case TOGGLE_SUSPEND_KEY:

diff --git a/nano.h b/nano.h
index 31b1c16ebc710c46a2f5468f0a67a3368322abc4..c314943b47b9b7abe92ff9779fc1dea0f228397f 100644 (file)
--- a/nano.h
+++ b/nano.h
@@ -111,6 +111,9 @@ typedef struct toggle {
 #define TEMP_OPT               (1<<16)
 #define CUT_TO_END             (1<<17)
 #define DISABLE_CURPOS                 (1<<18)
+/* 19, 20 in nano-1.1 */
+#define CLEAR_BACKUPSTRING    (1<<21)
+
 
 /* Control key sequences, changing these would be very very bad */
 

diff --git a/search.c b/search.c
index 42d8ae9a540615da0423fa09ef6a4f5ad1208a9f..d84311db9f2a92891eeaccf5eee3ce55346a49e6 100644 (file)
--- a/search.c
+++ b/search.c
@@ -82,6 +82,14 @@ int search_init(int replacing)
     buf = nmalloc(strlen(last_search) + 5);
     buf[0] = 0;
 
+
+    /* Clear the backupstring if we've changed from Pico mode to regular
+       mode */
+    if (ISSET(CLEAR_BACKUPSTRING)) {
+       free(backupstring);
+       backupstring = NULL;
+    }
+       
      /* Okay, fun time.  backupstring is our holder for what is being 
        returned from the statusq call.  Using answer for this would be tricky.
        Here, if we're using PICO_MODE, we only want nano to put the

diff --git a/winio.c b/winio.c
index 56e52a81f95e4d9ac62eaaee698f444d42be24a0..706db27fb848774be6ec2b09d58058544b2bbcae 100644 (file)
--- a/winio.c
+++ b/winio.c
@@ -454,10 +454,8 @@ int nanogetstr(int allowtabs, char *buf, char *def, shortcut s[], int slen,
     answer = mallocstrcpy(answer, inputbuf);
     free(inputbuf);
 
-    /* Now that the text is editable instead of bracketed, we have to 
-       check for answer == def, instead of answer == "" */
-    if  (((ISSET(PICO_MODE)) && !strcmp(answer, "")) || 
-       ((!ISSET(PICO_MODE)) && !strcmp(answer, def)))
+    /* In pico mode, just check for a blank answer here */
+    if  (((ISSET(PICO_MODE)) && !strcmp(answer, "")))
        return -2;
     else
        return 0;