nano

commit 2a44cb2ed8eef27da6219aa93fa1030c357946e3
parent 19a124e80614cf294b896eaf6e603eb52055114a
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Sun, 31 May 2020 16:41:07 +0200

tweaks: rename a function, to leave the old names behind

What the function does has changed, so better change the name too.

Diffstat:
M
src/browser.c
 | 
4
++--
M
src/global.c
 | 
12
++++++------
M
src/help.c
 | 
4
++--
M
src/proto.h
 | 
2
+-
M
src/rcfile.c
 | 
2
+-
M
src/winio.c
 | 
8
++++----

6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/browser.c b/src/browser.c
@@ -153,8 +153,8 @@ char *do_browser(char *path)
 #endif
 		func = interpret(&kbinput);
 
-		if (func == total_refresh) {
-			total_refresh();
+		if (func == full_refresh) {
+			full_refresh();
 #ifndef NANO_TINY
 			/* Simulate a window resize to force a directory reread. */
 			kbinput = KEY_WINCH;
diff --git a/src/global.c b/src/global.c
@@ -776,7 +776,7 @@ void shortcut_init(void)
 #ifdef ENABLE_HELP
 	/* The description ("x") and blank_after (0) are irrelevant,
 	 * because the help viewer does not have a help text. */
-	add_to_funcs(total_refresh, MHELP, N_("Refresh"), "x", 0, VIEW);
+	add_to_funcs(full_refresh, MHELP, N_("Refresh"), "x", 0, VIEW);
 	add_to_funcs(do_exit, MHELP, close_tag, "x", 0, VIEW);
 #endif
 
@@ -855,7 +855,7 @@ void shortcut_init(void)
 		/* TRANSLATORS: Try to keep the next seven strings at most 10 characters. */
 		N_("Go To Dir"), WITHORSANS(gotodir_gist), TOGETHER, VIEW);
 
-	add_to_funcs(total_refresh, MBROWSER,
+	add_to_funcs(full_refresh, MBROWSER,
 		N_("Refresh"), WITHORSANS(browserrefresh_gist), BLANKAFTER, VIEW);
 
 	add_to_funcs(do_search_forward, MBROWSER,
@@ -885,7 +885,7 @@ void shortcut_init(void)
 		N_("Next"), WITHORSANS(findnext_gist), TOGETHER, VIEW);
 	add_to_funcs(do_search_backward, MMAIN|MHELP,
 		N_("Where Was"), WITHORSANS(wherewas_gist), BLANKAFTER, VIEW);
-	add_to_funcs(total_refresh, MMAIN,
+	add_to_funcs(full_refresh, MMAIN,
 		N_("Refresh"), WITHORSANS(refresh_gist), BLANKAFTER, VIEW);
 #endif
 
@@ -998,7 +998,7 @@ void shortcut_init(void)
 		N_("Verbatim"), WITHORSANS(verbatim_gist), BLANKAFTER, NOVIEW);
 
 #ifndef NANO_TINY
-	add_to_funcs(total_refresh, MMAIN,
+	add_to_funcs(full_refresh, MMAIN,
 		N_("Refresh"), WITHORSANS(refresh_gist), TOGETHER, VIEW);
 #endif
 
@@ -1336,9 +1336,9 @@ void shortcut_init(void)
 	add_to_sclist(MEXECUTE, "^J", 0, do_full_justify, 0);
 #endif
 	if (!ISSET(PRESERVE))
-		add_to_sclist(MMAIN|MBROWSER|MHELP, "^L", 0, total_refresh, 0);
+		add_to_sclist(MMAIN|MBROWSER|MHELP, "^L", 0, full_refresh, 0);
 	else
-		add_to_sclist(MMAIN|MBROWSER, "^L", 0, total_refresh, 0);
+		add_to_sclist(MMAIN|MBROWSER, "^L", 0, full_refresh, 0);
 	add_to_sclist(MMAIN|MEXECUTE, "^Z", 0, do_suspend_void, 0);
 
 #ifndef NANO_TINY
diff --git a/src/help.c b/src/help.c
@@ -193,8 +193,8 @@ void show_help(void)
 #endif
 		func = interpret(&kbinput);
 
-		if (func == total_refresh) {
-			total_refresh();
+		if (func == full_refresh) {
+			full_refresh();
 		} else if (ISSET(SHOW_CURSOR) && (func == do_left || func == do_right ||
 											func == do_up || func == do_down)) {
 			func();
diff --git a/src/proto.h b/src/proto.h
@@ -639,7 +639,7 @@ size_t actual_last_column(size_t leftedge, size_t column);
 void edit_redraw(linestruct *old_current, update_type manner);
 void edit_refresh(void);
 void adjust_viewport(update_type location);
-void total_refresh(void);
+void full_refresh(void);
 void draw_all_subwindows(void);
 void do_cursorpos(bool force);
 void do_cursorpos_void(void);
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -384,7 +384,7 @@ keystruct *strtosc(const char *input)
 	else if (!strcmp(input, "backspace"))
 		s->func = do_backspace;
 	else if (!strcmp(input, "refresh"))
-		s->func = total_refresh;
+		s->func = full_refresh;
 	else if (!strcmp(input, "suspend"))
 		s->func = do_suspend_void;
 	else if (!strcmp(input, "casesens"))
diff --git a/src/winio.c b/src/winio.c
@@ -3308,8 +3308,8 @@ void adjust_viewport(update_type manner)
 	go_back_chunks(goal, &openfile->edittop, &openfile->firstcolumn);
 }
 
-/* Unconditionally redraw the entire screen. */
-void total_refresh(void)
+/* Tell curses to unconditionally redraw whatever was on the screen. */
+void full_refresh(void)
 {
 #ifdef USE_SLANG
 	/* Slang curses emulation brain damage, part 4: Slang doesn't define
@@ -3321,8 +3321,8 @@ void total_refresh(void)
 #endif
 }
 
-/* Redraw the entire screen, then refresh the title bar and the content of
- * the edit window (when not in the file browser), and the bottom bars. */
+/* Draw all elements of the screen.  That is: the title bar plus the content
+ * of the edit window (when not in the file browser), and the bottom bars. */
 void draw_all_subwindows(void)
 {
 	if (currmenu != MBROWSER && currmenu != MWHEREISFILE && currmenu != MGOTODIR)