From 9524f8996c2270baf332d3eb5b425d158d5c2baa Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Mon, 10 Dec 2018 23:29:45 +1100 Subject: [PATCH] Rename clear_screen() to input_clear_screen() This matches input_unclear_screen(), and avoids a clash with the clear_screen identifier defined in terminfo's . --- include/input.h | 2 +- source/input.c | 4 ++-- source/keys.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/input.h b/include/input.h index 13e1c36..1994c5d 100644 --- a/include/input.h +++ b/include/input.h @@ -27,7 +27,7 @@ /* keybinding functions */ void backward_character (char, char *); void backward_history (char, char *); - void clear_screen (char, char *); + void input_clear_screen (char, char *); void command_completion (char, char *); void forward_character (char, char *); void forward_history (char, char *); diff --git a/source/input.c b/source/input.c index dd4513f..138591d 100644 --- a/source/input.c +++ b/source/input.c @@ -1300,10 +1300,10 @@ BUILT_IN_KEYBINDING(type_text) } /* - * clear_screen: the CLEAR_SCREEN function for BIND. Clears the screen and + * input_clear_screen: the CLEAR_SCREEN function for BIND. Clears the screen and * starts it if it is held */ -BUILT_IN_KEYBINDING(clear_screen) +BUILT_IN_KEYBINDING(input_clear_screen) { set_hold_mode(NULL, OFF, 1); clear_window_by_refnum(0); diff --git a/source/keys.c b/source/keys.c index bb23e7c..8525936 100644 --- a/source/keys.c +++ b/source/keys.c @@ -190,7 +190,7 @@ static KeyMapNames key_names[] = #ifdef WANT_CHELP { "CHELP", do_chelp }, #endif - { "CLEAR_SCREEN", clear_screen }, + { "CLEAR_SCREEN", input_clear_screen }, { "COMMAND_COMPLETION", command_completion }, { "CPU_SAVER", cpu_saver_on }, { "DCC_PLIST", dcc_plist },