really fix one of the last fixes

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2545 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-05-26 05:27:19 +00:00
parent 31b159c1b3
commit 045d130cfa
1 changed files with 10 additions and 10 deletions

View File

@ -2441,7 +2441,7 @@ int nanogetstr(bool allow_tabs, const char *buf, const char *curranswer,
{ {
int kbinput; int kbinput;
bool meta_key, func_key, s_or_t, ran_func, finished; bool meta_key, func_key, s_or_t, ran_func, finished;
size_t answer_len = strlen(curranswer); size_t curranswer_len = strlen(curranswer);
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
bool tabbed = FALSE; bool tabbed = FALSE;
/* Whether we've pressed Tab more than once consecutively. */ /* Whether we've pressed Tab more than once consecutively. */
@ -2455,17 +2455,17 @@ int nanogetstr(bool allow_tabs, const char *buf, const char *curranswer,
* any. */ * any. */
#endif #endif
/* Only put statusbar_x at the end of the string if it's
* uninitialized, if it would be past the end of the string as it
* is, or if resetstatuspos is TRUE. Otherwise, leave it alone.
* This is so the cursor position stays at the same place if a
* prompt-changing toggle is pressed. */
if (statusbar_x == (size_t)-1 || statusbar_x > answer_len ||
resetstatuspos)
statusbar_x = answer_len;
answer = mallocstrcpy(answer, curranswer); answer = mallocstrcpy(answer, curranswer);
/* Only put statusbar_x at the end of the string if it's
* uninitialized, if it would be past the end of curranswer, or if
* resetstatuspos is TRUE. Otherwise, leave it alone. This is so
* the cursor position stays at the same place if a prompt-changing
* toggle is pressed. */
if (statusbar_x == (size_t)-1 || statusbar_x > curranswer_len ||
resetstatuspos)
statusbar_x = curranswer_len;
currshortcut = s; currshortcut = s;
nanoget_repaint(buf, answer, statusbar_x); nanoget_repaint(buf, answer, statusbar_x);