diff --git a/src/fileio.c b/src/fileio.c
index 1b30e0f..8437b2b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -312,7 +312,7 @@
 	curbuf->b_op_start = orig_start;
 
 	if (flags & READ_NOFILE)
-	    return FAIL;
+	    return NOTDONE;  // so that BufEnter can be triggered
     }
 
     if ((shortmess(SHM_OVER) || curbuf->b_help) && p_verbose == 0)
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index c043a35..4b09285 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -681,9 +681,19 @@
   " On MS-Windows we can't edit the directory, make sure we wipe the right
   " buffer.
   bwipe! Xdir
-
   call delete('Xdir', 'd')
   au! BufEnter
+
+  " Editing a "nofile" buffer doesn't read the file but does trigger BufEnter
+  " for historic reasons.
+  new somefile
+  set buftype=nofile
+  au BufEnter somefile call setline(1, 'some text')
+  edit
+  call assert_equal('some text', getline(1))
+
+  bwipe!
+  au! BufEnter
 endfunc
 
 " Closing a window might cause an endless loop
diff --git a/src/version.c b/src/version.c
index 9590974..e32f990 100644
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    275,
+/**/
     274,
 /**/
     273,