Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

1 files changed, 4 insertions, 4 deletions

diff --git a/editors/vi.c b/editors/vi.c
index 1fa97b568..926aef19b 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2017,8 +2017,7 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
                         p--;
                 }
         } else if (c == erase_char || c == 8 || c == 127) { // Is this a BS
-                //     123456789
-                if ((p[-1] != '\n') && (dot>text)) {
+                if (p > text) {
                         p--;
                         p = text_hole_delete(p, p, ALLOW_UNDO_QUEUED);  // shrink buffer 1 char
                 }
@@ -4073,8 +4072,9 @@ static void do_cmd(int c)
                 undo_queue_commit();
                 break;
         case KEYCODE_DELETE:
-                c = 'x';
-                // fall through
+                if (dot < end - 1)
+                        dot = yank_delete(dot, dot, 1, YANKDEL, ALLOW_UNDO);
+                break;
         case 'X':                       // X- delete char before dot
         case 'x':                       // x- delete the current char
         case 's':                       // s- substitute the current char