nano

commit c30fc242c3291e8cd0645227385722bba27d2374
parent 66d60099a244a4e46b649f101c2513bd0a504f38
Author: Chris Allegretta <chrisa@asty.org>
Date:   Mon, 11 Aug 2003 00:32:45 +0000

- winio.c:nanogetstr() - Fix problem where pressing down,up,down does not blank the search prompt but keeps the previous search (DLR)


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

Diffstat:
M
ChangeLog
 | 
2
++
M
winio.c
 | 
13
++++++++-----

2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -25,6 +25,8 @@ CVS code -
 	  added at the bottom of the history (but which was not in the
 	  history) would not be preserved after scrolling down to the
 	  blank bottom entry and then scrolling back up. (DLR)
+	- Fix problem where pressing down,up,down does not blank the
+	  search prompt but keeps the previous search (DLR).
 	- Handle Alt-[-F and H (DLR, fixed home and end not working with
 	  -K in statusbar).  
 - configure.ac:
diff --git a/winio.c b/winio.c
@@ -436,12 +436,15 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
 
 		/* otherwise, if currentbuf is NULL and use_cb isn't 2, 
 		   it means that we're scrolling down at the bottom of
-		   the search history and the current answer needs to be
-		   saved in currentbuf; do this, blank out answer, and
-		   set use_cb to 2 */
+		   the search history and the current answer (if it's
+		   not blank) needs to be saved in currentbuf; do this,
+		   blank out answer (if necessary), and set use_cb to
+		   2 */
 		} else if (use_cb != 2) {
-		    currentbuf = mallocstrcpy(currentbuf, answer);
-		    answer = mallocstrcpy(answer, "");
+		    if (answer[0] != '\0') {
+			currentbuf = mallocstrcpy(currentbuf, answer);
+			answer = mallocstrcpy(answer, "");
+		    }
 		    xend = 0;
 		    use_cb = 2;
 		}