1c1
< /* $NetBSD: readline.c,v 1.113 2014/10/18 08:33:23 snj Exp $ */
---
> /* $NetBSD: readline.c,v 1.115 2015/04/01 15:23:15 christos Exp $ */
34c34
< __RCSID("$NetBSD: readline.c,v 1.113 2014/10/18 08:33:23 snj Exp $");
---
> __RCSID("$NetBSD: readline.c,v 1.115 2015/04/01 15:23:15 christos Exp $");
37c37
< __FBSDID("$FreeBSD: head/lib/libedit/readline.c 278422 2015-02-08 23:03:41Z bapt $");
---
> __FBSDID("$FreeBSD: head/lib/libedit/readline.c 283084 2015-05-18 22:03:05Z bapt $");
366a367,397
> /*
> * Set some readline compatible key-bindings.
> */
> el_set(e, EL_BIND, "^R", "em-inc-search-prev", NULL);
>
> /*
> * Allow the use of Home/End keys.
> */
> el_set(e, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
> el_set(e, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
> el_set(e, EL_BIND, "\\e[7~", "ed-move-to-beg", NULL);
> el_set(e, EL_BIND, "\\e[8~", "ed-move-to-end", NULL);
> el_set(e, EL_BIND, "\\e[H", "ed-move-to-beg", NULL);
> el_set(e, EL_BIND, "\\e[F", "ed-move-to-end", NULL);
>
> /*
> * Allow the use of the Delete/Insert keys.
> */
> el_set(e, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL);
> el_set(e, EL_BIND, "\\e[2~", "ed-quoted-insert", NULL);
>
> /*
> * Ctrl-left-arrow and Ctrl-right-arrow for word moving.
> */
> el_set(e, EL_BIND, "\\e[1;5C", "em-next-word", NULL);
> el_set(e, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL);
> el_set(e, EL_BIND, "\\e[5C", "em-next-word", NULL);
> el_set(e, EL_BIND, "\\e[5D", "ed-prev-word", NULL);
> el_set(e, EL_BIND, "\\e\\e[C", "em-next-word", NULL);
> el_set(e, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL);
>
953c984,985
< (void)strcpy(&str[j], &str[j + 1]);
---
> len = strlen(&str[j + 1]) + 1;
> memmove(&str[j], &str[j + 1], len);