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
This commit is contained in:
parent
fedd90496c
commit
f5bde0f68f
3 changed files with 32 additions and 1 deletions
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
|||
5.3.1
|
||||
5.3.1b
|
||||
|
|
|
|||
29
qe.c
29
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;
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue