ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more comment fixes 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2495 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-04-29 04:32:38 +00:00
parent e41e8dbead
commit fcdfb7f75f
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/winio.c
View File

@ -2537,13 +2537,12 @@ int nanogetstr(bool allow_tabs, const char *buf, const char *def,
case NANO_PREVLINE_KEY: case NANO_PREVLINE_KEY:
#ifndef NANO_SMALL #ifndef NANO_SMALL
if (history_list != NULL) { if (history_list != NULL) {
/* If currentbuf is NULL, or if use_cb is 1, /* If currentbuf is NULL, use_cb is 1, and
* currentbuf isn't NULL, and currentbuf is * currentbuf is different from answer, it means
* different from answer, it means that we're * that we're scrolling up at the top of the search
* scrolling up at the top of the search history, * history, and we need to save the current answer
* and we need to save the current answer in * in currentbuf. Do this and reset use_cb to 0. */
* currentbuf. Do this and reset use_cb to 0. */ if (currentbuf != NULL && use_cb == 1 &&
if (currentbuf == NULL || (use_cb == 1 &&
strcmp(currentbuf, answer) != 0)) { strcmp(currentbuf, answer) != 0)) {
currentbuf = mallocstrcpy(currentbuf, answer); currentbuf = mallocstrcpy(currentbuf, answer);
use_cb = 0; use_cb = 0;
@ -2552,29 +2551,26 @@ int nanogetstr(bool allow_tabs, const char *buf, const char *def,
/* If currentbuf isn't NULL, use_cb is 2, and /* If currentbuf isn't NULL, use_cb is 2, and
* currentbuf is different from answer, it means * currentbuf is different from answer, it means
* that we're scrolling up at the bottom of the * that we're scrolling up at the bottom of the
* search history, and we need to make the string in * search history, and we need to restore the
* currentbuf the current answer. Do this, blow * current answer from currentbuf. Do this, blow
* away currentbuf since we don't need it anymore, * away currentbuf since we don't need it anymore,
* and reset use_cb to 0. */ * and reset use_cb to 0. */
if (currentbuf != NULL && use_cb == 2 && if (currentbuf != NULL && use_cb == 2 &&
strcmp(currentbuf, answer) != 0) { strcmp(currentbuf, answer) != 0) {
answer = mallocstrcpy(answer, currentbuf); answer = mallocstrcpy(answer, currentbuf);
answer_len = strlen(answer);
free(currentbuf); free(currentbuf);
currentbuf = NULL; currentbuf = NULL;
answer_len = strlen(answer);
use_cb = 0; use_cb = 0;
/* Otherwise, get the older search from the history /* Otherwise, get the older search from the history
* list and save it in answer. If there is no older * list and save it in answer. */
* search, blank out answer. */
} else if ((history = } else if ((history =
get_history_older(history_list)) != NULL) { get_history_older(history_list)) != NULL) {
answer = mallocstrcpy(answer, history); answer = mallocstrcpy(answer, history);
answer_len = strlen(history); answer_len = strlen(history);
} else {
answer = mallocstrcpy(answer, "");
answer_len = 0;
} }
statusbar_x = answer_len; statusbar_x = answer_len;
} }
#endif #endif
@ -2588,10 +2584,11 @@ int nanogetstr(bool allow_tabs, const char *buf, const char *def,
get_history_newer(history_list)) != NULL) { get_history_newer(history_list)) != NULL) {
answer = mallocstrcpy(answer, history); answer = mallocstrcpy(answer, history);
answer_len = strlen(history); answer_len = strlen(history);
/* If currentbuf isn't NULL and use_cb isn't 2, it /* If currentbuf isn't NULL and use_cb isn't 2, it
* means that we're scrolling down at the bottom of * means that we're scrolling down at the bottom of
* the search history and we need to make the string * the search history and we need to restore the
* in currentbuf the current answer; do this, blow * current answer from currentbuf. Do this, blow
* away currentbuf since we don't need it anymore, * away currentbuf since we don't need it anymore,
* and set use_cb to 1. */ * and set use_cb to 1. */
} else if (currentbuf != NULL && use_cb != 2) { } else if (currentbuf != NULL && use_cb != 2) {
@ -2600,12 +2597,13 @@ int nanogetstr(bool allow_tabs, const char *buf, const char *def,
free(currentbuf); free(currentbuf);
currentbuf = NULL; currentbuf = NULL;
use_cb = 1; use_cb = 1;
/* Otherwise, if currentbuf is NULL and use_cb isn't /* Otherwise, if currentbuf is NULL and use_cb isn't
* 2, it means that we're scrolling down at the * 2, it means that we're scrolling down at the
* bottom of the search history and the current * bottom of the search history and we need to save
* answer (if it's not blank) needs to be saved in * the current answer (if it's not blank) in
* currentbuf. Do this, blank out answer (if * currentbuf. Do this, blank out answer, and set
* necessary), and set use_cb to 2. */ * use_cb to 2. */
} else if (use_cb != 2) { } else if (use_cb != 2) {
if (answer[0] != '\0') { if (answer[0] != '\0') {
currentbuf = mallocstrcpy(currentbuf, currentbuf = mallocstrcpy(currentbuf,
@ -2615,6 +2613,7 @@ int nanogetstr(bool allow_tabs, const char *buf, const char *def,
answer_len = 0; answer_len = 0;
use_cb = 2; use_cb = 2;
} }
statusbar_x = answer_len; statusbar_x = answer_len;
} }
#endif #endif