Merge branch 'busybox' into merge

1 files changed, 4 insertions, 3 deletions

diff --git a/editors/vi.c b/editors/vi.c
index 7ad8412a2..e59083ddb 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2422,9 +2422,10 @@ static int init_text_buffer(char *fn)
 
         update_filename(fn);
         rc = file_insert(fn, text, 1);
-        if (rc < 0) {
-                // file doesnt exist. Start empty buf with dummy line
-                char_insert(text, '\n', NO_UNDO);
+        if (rc <= 0 || *(end - 1) != '\n') {
+                // file doesn't exist or doesn't end in a newline.
+                // insert a newline to the end
+                char_insert(end, '\n', NO_UNDO);
         }
 
         flush_undo_data();