1 files changed, 7 insertions, 3 deletions

diff --git a/src/fileio.c b/src/fileio.c
index 17be8acfaab..c3f2a2c9cba 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3463,9 +3463,13 @@ actually used.")
   /* Prevent redisplay optimizations.  */
   current_buffer->clip_changed = 1;
 
-  if (!NILP (beg) || !NILP (end))
-    if (!NILP (visit))
-      error ("Attempt to visit less than an entire file");
+  if (!NILP (visit))
+    {
+      if (!NILP (beg) || !NILP (end))
+        error ("Attempt to visit less than an entire file");
+      if (BEG < Z && NILP (replace))
+        error ("Cannot do file visiting in a non-empty buffer");
+    }
 
   if (!NILP (beg))
     CHECK_NUMBER (beg, 0);