diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2012-04-11 03:08:27 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2012-04-11 03:08:27 +0000 |
| commit | 5d8a59d2eb915ad82effa1a0cade050c5bbddb6c (patch) | |
| tree | ef3368ccc034b2797f43de53706206b848d93eda /devel/libedit/files/patch-common.c | |
| parent | Add relevant files to build octave-forge while updating 3.4 to 3.6. (diff) | |
- Sync with NetBSD upstream
PR: 166435
Submitted by: Pedro Giffuni <giffunip@tutopia.com>
Diffstat (limited to 'devel/libedit/files/patch-common.c')
| -rw-r--r-- | devel/libedit/files/patch-common.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/devel/libedit/files/patch-common.c b/devel/libedit/files/patch-common.c new file mode 100644 index 000000000000..23a30183c36e --- /dev/null +++ b/devel/libedit/files/patch-common.c @@ -0,0 +1,29 @@ +Revision 212191 +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'). + +--- common.c 2007/03/11 18:30:22 167457 ++++ common.c 2010/09/03 22:24:26 212191 +@@ -163,15 +163,12 @@ + 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; |