From 68040f210aec0bbbf9d5646d5c355bf9e6462740 Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Sun, 10 May 2020 12:58:16 +0200 Subject: [PATCH] core: Always remove final newline when pasting Since pasting doesn't send the line now, it's more practical to always remove the final newline so you don't end up with an empty line at the end of the input buffer. Fixes a part of #1498 --- src/gui/gui-key.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/gui-key.c b/src/gui/gui-key.c index 30e30a8e0..32fdb74a0 100644 --- a/src/gui/gui-key.c +++ b/src/gui/gui-key.c @@ -2802,19 +2802,18 @@ gui_key_buffer_remove (int index, int number) } /* - * Removes final newline at end of paste if there is only one line to paste. + * Removes final newline at end of paste. */ void gui_key_paste_remove_newline () { - if ((gui_key_paste_lines <= 1) - && (gui_key_buffer_size > 0) + if ((gui_key_buffer_size > 0) && ((gui_key_buffer[gui_key_buffer_size - 1] == '\r') || (gui_key_buffer[gui_key_buffer_size - 1] == '\n'))) { gui_key_buffer_size--; - gui_key_paste_lines = 0; + gui_key_paste_lines--; } }