in do_statusbar_input(), if we get a verbatim input sequence ending with

Ctrl-J, remove the Ctrl-J from the buffer before interpreting it as
Enter, so that it doesn't erroneously fall through to the edit window
and get interpreted as Justify

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

diff --git a/ChangeLog b/ChangeLog
index 75629d8c038382512273042419189c3685f648aa..9fd3c5d9cdd62b5b803deaab9be468860302d60b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ CVS code -
          properly reset when we get out of all statusbar prompts.
          Changes to do_insertfile(), do_writeout(),
          handle_sigwinch(), main(), and do_prompt_abort(). (DLR)
+- prompt.c:
+  do_statusbar_input()
+       - If we get a verbatim input sequence ending with Ctrl-J, remove
+         the Ctrl-J from the buffer before interpreting it as Enter, so
+         that it doesn't erroneously fall through to the edit window
+         and get interpreted as Justify. (DLR)
 - winio.c:
   get_input()
        - Simplify to avoid an unnecessary key_buffer_len check. (DLR)

diff --git a/src/prompt.c b/src/prompt.c
index bccc5d169aa92c997ba43dc5cfd8ca0d990b8ee7..da9b5895d7f567f2eb689dbc67b6dc9f50075419 100644 (file)
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -224,10 +224,12 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *s_or_t,
 
                            do_statusbar_verbatim_input(&got_enter);
 
-                           /* If we got the Enter key, set input to the
-                            * key value for Enter, and set finished to
-                            * TRUE to indicate that we're done. */
+                           /* If we got the Enter key, remove it from
+                            * the input buffer, set input to the key
+                            * value for Enter, and set finished to TRUE
+                            * to indicate that we're done. */
                            if (got_enter) {
+                               get_input(NULL, 1);
                                input = NANO_ENTER_KEY;
                                *finished = TRUE;
                            }