From b458fc1f9976efad8d332a275994d4d5ad982a05 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Tue, 13 Oct 2020 15:55:37 +0200 Subject: libedit: bind M-Enter to newline-insert as well --- json-rpc-shell.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/json-rpc-shell.c b/json-rpc-shell.c index b7c99a9..82ad5ea 100644 --- a/json-rpc-shell.c +++ b/json-rpc-shell.c @@ -643,6 +643,15 @@ input_el_on_run_editor (EditLine *editline, int key) return CC_NORM; } +static unsigned char +input_el_on_newline_insert (EditLine *editline, int key) +{ + (void) key; + + el_insertstr (editline, "\n"); + return CC_REFRESH; +} + static void input_el_install_prompt (struct input_el *self) { @@ -671,19 +680,17 @@ input_el_start (struct input *input, const char *program_name) // Just what are you doing? el_set (self->editline, EL_BIND, "^u", "vi-kill-line-prev", NULL); - // It's probably better to handle this ourselves + // It's probably better to handle these ourselves el_set (self->editline, EL_ADDFN, "send-line", "Send line", input_el_on_return); el_set (self->editline, EL_BIND, "\n", "send-line", NULL); - - // It's probably better to handle this ourselves el_set (self->editline, EL_ADDFN, "run-editor", "Run editor to edit line", input_el_on_run_editor); el_set (self->editline, EL_BIND, "M-e", "run-editor", NULL); el_set (self->editline, EL_ADDFN, - "complete", "Complete word", input_el_on_complete); - el_set (self->editline, EL_BIND, "\t", "complete", NULL); + "newline-insert", "Insert a newline", input_el_on_newline_insert); + el_set (self->editline, EL_BIND, "M-\n", "newline-insert", NULL); // Source the user's defaults file el_source (self->editline, NULL); -- cgit v1.2.3-70-g09d2