diff --git a/ChangeLog b/ChangeLog index 8f3ad1467bcb9fb52adc20949f168572a3f28c01..b6418523f8ae9b10ceff57a183e6bcbe40008115 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Chop an always-FALSE parameter and delete an unused return value. * src/prompt.c (do_prompt): Remove a superfluous free. * src/prompt.c (update_the_bar): Bundle some statements. + * src/prompt.c (need_statusbar_update): Elide this function. 2016-01-22 Benno Schulenberg <bensberg@justemail.net> * src/utils.c (get_homedir): Don't use $HOME when we're root, because diff --git a/src/prompt.c b/src/prompt.c index 4d9e9165dc59d8508487594582c60f6286b24e52..d4a07a5accf7cf652b3753d6aaeaa3df65d4737f 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -646,25 +646,16 @@ void update_statusbar_line(const char *curranswer, size_t index) wnoutrefresh(bottomwin); } -/* Return TRUE if we need an update after moving the cursor, and FALSE - * otherwise. We need an update if pww_save and statusbar_pww are on - * different pages. */ -bool need_statusbar_update(size_t pww_save) -{ - size_t start_col = strlenpt(prompt) + 2; - - return get_statusbar_page_start(start_col, start_col + pww_save) != - get_statusbar_page_start(start_col, start_col + statusbar_pww); -} - /* Update the statusbar line /if/ the placewewant changes page. */ void update_the_bar(void) { + size_t start_col = strlenpt(prompt) + 2; size_t was_pww = statusbar_pww; statusbar_pww = statusbar_xplustabs(); - if (need_statusbar_update(was_pww)) + if (get_statusbar_page_start(start_col, start_col + statusbar_pww) != + get_statusbar_page_start(start_col, start_col + was_pww)) update_statusbar_line(answer, statusbar_x); } diff --git a/src/proto.h b/src/proto.h index 4f737df2dfce4beb039fda11a74cea53f3146e14..2e342bd36625fef4f8a432ab90b2324aa11ba8f0 100644 --- a/src/proto.h +++ b/src/proto.h @@ -536,7 +536,6 @@ size_t statusbar_xplustabs(void); size_t get_statusbar_page_start(size_t start_col, size_t column); void reset_statusbar_cursor(void); void update_statusbar_line(const char *curranswer, size_t index); -bool need_statusbar_update(size_t pww_save); void update_the_bar(void); void total_statusbar_refresh(void (*refresh_func)(void)); functionptrtype get_prompt_string(int *value, bool allow_tabs,