nano

commit decee3206727b741d97623cb71c45aabe185f855
parent f01dd29f48064d2476a5cab2ada43b7a30ec0b43
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sun, 24 Jan 2016 20:44:39 +0000

Eliding an unneeded function.


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

Diffstat:
M
ChangeLog
 | 
1
+
M
src/prompt.c
 | 
15
+++------------
M
src/proto.h
 | 
1
-

3 files changed, 4 insertions(+), 13 deletions(-)
diff --git 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
@@ -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
@@ -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,