diff --git a/ChangeLog b/ChangeLog index 2eee4e15..d03ad29c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ CVS code - - nano.h: - Readd MIN_EDITOR_COLS #define. (DLR) - winio.c: + nanoget_repaint() + - Rename parameter inputbuf to buf, for consistency. (DLR) edit_add() - Rename to edit_draw(), and rename parameter yval to line. (DLR) diff --git a/src/proto.h b/src/proto.h index d831636f..42654264 100644 --- a/src/proto.h +++ b/src/proto.h @@ -646,7 +646,7 @@ void blank_bottombars(void); void check_statusblank(void); char *display_string(const char *buf, size_t start_col, size_t len, bool dollars); -void nanoget_repaint(const char *inputbuf, size_t x); +void nanoget_repaint(const char *buf, size_t x); int nanogetstr(bool allow_tabs, const char *curranswer, #ifndef NANO_SMALL filestruct **history_list, diff --git a/src/winio.c b/src/winio.c index 354d62ef..76d86eb9 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2494,15 +2494,15 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool /* Repaint the statusbar when getting a character in nanogetstr(). Note * that we must turn on A_REVERSE here, since do_help() turns it off! */ -void nanoget_repaint(const char *inputbuf, size_t x) +void nanoget_repaint(const char *buf, size_t x) { size_t start_col, xpt, page_start; char *expanded; - assert(x <= strlen(inputbuf)); + assert(x <= strlen(buf)); start_col = strlenpt(prompt) + 1; - xpt = strnlenpt(inputbuf, x); + xpt = strnlenpt(buf, x); page_start = get_statusbar_page_start(start_col, start_col + xpt); wattron(bottomwin, A_REVERSE); @@ -2513,8 +2513,8 @@ void nanoget_repaint(const char *inputbuf, size_t x) waddch(bottomwin, ':'); waddch(bottomwin, (page_start == 0) ? ' ' : '$'); - expanded = display_string(inputbuf, page_start, COLS - start_col - - 1, FALSE); + expanded = display_string(buf, page_start, COLS - start_col - 1, + FALSE); waddstr(bottomwin, expanded); free(expanded);