ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
David Lawrence Ramsey 2006-09-29 15:45:10 +00:00
parent 0061bf5b71
commit b9f007430b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -5,6 +5,12 @@ CVS code -
properly reset when we get out of all statusbar prompts. properly reset when we get out of all statusbar prompts.
Changes to do_insertfile(), do_writeout(), Changes to do_insertfile(), do_writeout(),
handle_sigwinch(), main(), and do_prompt_abort(). (DLR) 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: - winio.c:
get_input() get_input()
- Simplify to avoid an unnecessary key_buffer_len check. (DLR) - Simplify to avoid an unnecessary key_buffer_len check. (DLR)

8
src/prompt.c
View File

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