d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libedit: Do not move the cursor for ed-delete-next-char in emacs mode.

Browse Source 
This makes ed-delete-next-char suitable for mapping to the <Delete> key.

Behaviour in vi mode is unchanged (for 'x').
This commit is contained in:
Jilles Tjoelker 2010-09-03 22:24:26 +00:00
parent fe5d61a4cf
commit 96e75396e1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libedit/common.c
View File

@ -163,15 +163,12 @@ ed_delete_next_char(EditLine *el, int c)
return (CC_ERROR); return (CC_ERROR);
#endif #endif
} }
} else { } else
if (el->el_line.cursor != el->el_line.buffer) return (CC_ERROR);
el->el_line.cursor--;
else
return (CC_ERROR);
}
} }
c_delafter(el, el->el_state.argument); /* delete after dot */ 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) el->el_line.cursor > el->el_line.buffer)
/* bounds check */ /* bounds check */
el->el_line.cursor = el->el_line.lastchar - 1; el->el_line.cursor = el->el_line.lastchar - 1;