diff options
| author | Jilles Tjoelker <jilles@FreeBSD.org> | 2010-09-03 22:24:26 +0000 |
|---|---|---|
| committer | Jilles Tjoelker <jilles@FreeBSD.org> | 2010-09-03 22:24:26 +0000 |
| commit | 96e75396e1b322d354f5418f9947d26be47ef0e0 (patch) | |
| tree | 332ffae08a8212bcd4b2e8c87208d9f24caf3bfc /lib | |
| parent | fe5d61a4cfad1bcfd0cd225c435882ab3b4fdb3a (diff) | |
| download | src-96e75396e1b322d354f5418f9947d26be47ef0e0.tar.gz src-96e75396e1b322d354f5418f9947d26be47ef0e0.zip | |
libedit: Do not move the cursor for ed-delete-next-char in emacs mode.
This makes ed-delete-next-char suitable for mapping to the <Delete> key.
Behaviour in vi mode is unchanged (for 'x').
Notes
Notes:
svn path=/head/; revision=212191
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libedit/common.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/libedit/common.c b/lib/libedit/common.c index d4a9fa302bbc..d314eef52286 100644 --- a/lib/libedit/common.c +++ b/lib/libedit/common.c @@ -163,15 +163,12 @@ ed_delete_next_char(EditLine *el, int c) return (CC_ERROR); #endif } - } else { - if (el->el_line.cursor != el->el_line.buffer) - el->el_line.cursor--; - else - return (CC_ERROR); - } + } else + return (CC_ERROR); } c_delafter(el, el->el_state.argument); /* delete after dot */ - if (el->el_line.cursor >= el->el_line.lastchar && + if (el->el_map.type == MAP_VI && + el->el_line.cursor >= el->el_line.lastchar && el->el_line.cursor > el->el_line.buffer) /* bounds check */ el->el_line.cursor = el->el_line.lastchar - 1; |