nano

commit 4c505e51278080291870f78a2c92694a3a6203b5
parent e3b13ae124a149f64d76593441736a0e780400f6
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Wed, 10 Jan 2018 17:40:07 +0100

tweaks: rename a function, for aptness, and drop a superfluous check

Diffstat:
M
src/proto.h
 | 
1
-
M
src/winio.c
 | 
8
++------

2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/proto.h b/src/proto.h
@@ -624,7 +624,6 @@ void dump_filestruct(const filestruct *inptr);
 /* Most functions in winio.c. */
 void record_macro(void);
 void run_macro(void);
-void get_key_buffer(WINDOW *win);
 size_t get_key_buffer_len(void);
 void unget_kbinput(int kbinput, bool metakey);
 int get_kbinput(WINDOW *win, bool showcursor);
diff --git a/src/winio.c b/src/winio.c
@@ -169,15 +169,11 @@ void run_macro(void)
 
 /* Read in a sequence of keystrokes from the given window and save them
  * in the keystroke buffer. */
-void get_key_buffer(WINDOW *win)
+void read_keys_from(WINDOW *win)
 {
 	int input = ERR;
 	size_t errcount = 0;
 
-	/* If the keystroke buffer isn't empty, get out. */
-	if (key_buffer != NULL)
-		return;
-
 	/* Before reading the first keycode, display any pending screen updates. */
 	doupdate();
 
@@ -309,7 +305,7 @@ int *get_input(WINDOW *win, size_t input_len)
 	int *input;
 
 	if (key_buffer_len == 0 && win != NULL)
-		get_key_buffer(win);
+		read_keys_from(win);
 
 	if (key_buffer_len == 0)
 		return NULL;