From f5bde0f68fdbfa4ed7f17b400e68ab979e88512e Mon Sep 17 00:00:00 2001 From: Charlie Gordon Date: Sun, 7 Aug 2022 01:50:47 +0200 Subject: [PATCH] Add kill-whole-line - add kill-whole-line, bound to M-K (Meta Shift k) cannot bind to C-S-Backspace inside terminal - bumped version to 5.3.1b - close #3 --- VERSION | 2 +- qe.c | 29 +++++++++++++++++++++++++++++ qeconfig.h | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c7cb131..db01b10 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.3.1 +5.3.1b diff --git a/qe.c b/qe.c index 642ec32..1730094 100644 --- a/qe.c +++ b/qe.c @@ -1988,6 +1988,8 @@ void do_kill_line(EditState *s, int argval) { int p1, p2, offset1, dir = 1; + // XXX: should handle kill_whole_line variable + // XXX: can there be a variable and a function with the same name? p1 = s->offset; if (argval == NO_ARG) { if (s->region_style && s->b->mark != s->offset) { @@ -2035,6 +2037,33 @@ void do_kill_beginning_of_line(EditState *s, int argval) do_kill_line(s, argval == NO_ARG ? 0 : -argval); } +void do_kill_whole_line(EditState *s, int n) +{ + // XXX: should not modify s->offset + // XXX: should fix behavior for binary and hex modes + int p1 = 0, p2 = 0, dir = n; + if (n < 0) { + do_eol(s); + p1 = s->offset; + while (n++ < 0 && s->offset > 0) { + do_bol(s); + s->offset = eb_prev(s->b, s->offset); + } + p2 = s->offset; + } else + if (n > 0) { + do_bol(s); + p1 = s->offset; + while (n-- > 0 && s->offset < s->b->total_size) { + do_eol(s); + s->offset = eb_next(s->b, s->offset); + } + p2 = s->offset; + } + if (p1 != p2) + do_kill(s, p1, p2, dir, 0); +} + void do_kill_word(EditState *s, int n) { int start = s->offset; diff --git a/qeconfig.h b/qeconfig.h index 88d7d77..b5a52a2 100644 --- a/qeconfig.h +++ b/qeconfig.h @@ -118,6 +118,8 @@ static CmdDef basic_commands[] = { "append-next-kill", do_append_next_kill, "") CMD2( KEY_CTRL('k'), KEY_NONE, "kill-line", do_kill_line, ESi, "p" , "") + CMD3( KEY_META('K'), KEY_NONE, // should be C-S-Backspace + "kill-whole-line", do_kill_whole_line, ESi, 1, "P", "") CMD2( KEY_NONE, KEY_NONE, "kill-beginning-of-line", do_kill_beginning_of_line, ESi, "p" , "") CMD3( KEY_META(KEY_DEL), KEY_META(KEY_BS),